Skip to content

Commit 0c69e7a

Browse files
authored
Merge pull request #6228 from iambenzo/remove-projects-page
remove /projects/
2 parents 58f833d + 11d4037 commit 0c69e7a

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

readthedocs/projects/urls/public.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,11 @@
55
from readthedocs.builds import views as build_views
66
from readthedocs.constants import pattern_opts
77
from readthedocs.projects.views import public
8-
from readthedocs.projects.views.public import ProjectDetailView, ProjectIndex
8+
from readthedocs.projects.views.public import ProjectDetailView, ProjectTagIndex
99
from readthedocs.search import views as search_views
1010

1111

1212
urlpatterns = [
13-
url(
14-
r'^$',
15-
ProjectIndex.as_view(),
16-
name='projects_list',
17-
),
1813
url(
1914
r'^(?P<invalid_project_slug>{project_slug}_{project_slug})/'.format(**pattern_opts),
2015
public.project_redirect,
@@ -78,7 +73,7 @@
7873
),
7974
url(
8075
r'^tags/(?P<tag>[-\w]+)/$',
81-
ProjectIndex.as_view(),
76+
ProjectTagIndex.as_view(),
8277
name='projects_tag_detail',
8378
),
8479
]

readthedocs/projects/views/public.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
mimetypes.add_type('application/epub+zip', '.epub')
3838

3939

40-
class ProjectIndex(ListView):
40+
class ProjectTagIndex(ListView):
4141

4242
"""List view of public :py:class:`Project` instances."""
4343

@@ -47,11 +47,8 @@ def get_queryset(self):
4747
queryset = Project.objects.public(self.request.user)
4848
queryset = queryset.exclude(users__profile__banned=True)
4949

50-
if self.kwargs.get('tag'):
51-
self.tag = get_object_or_404(Tag, slug=self.kwargs.get('tag'))
52-
queryset = queryset.filter(tags__slug__in=[self.tag.slug])
53-
else:
54-
self.tag = None
50+
self.tag = get_object_or_404(Tag, slug=self.kwargs.get('tag'))
51+
queryset = queryset.filter(tags__slug__in=[self.tag.slug])
5552

5653
if self.kwargs.get('username'):
5754
self.user = get_object_or_404(

0 commit comments

Comments
 (0)