Skip to content

Remove internal filtering from Version and Build listing #5837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion readthedocs/builds/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def get_queryset(self):
Project.objects.protected(self.request.user),
slug=self.project_slug,
)
queryset = Build.internal.public(
queryset = Build.objects.public(
user=self.request.user,
project=self.project,
).select_related('project', 'version')
Expand Down
4 changes: 2 additions & 2 deletions readthedocs/projects/views/public.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)

project = self.get_object()
context['versions'] = Version.internal.public(
context['versions'] = Version.objects.public(
user=self.request.user,
project=project,
)
Expand Down Expand Up @@ -268,7 +268,7 @@ def project_versions(request, project_slug):
slug=project_slug,
)

versions = Version.internal.public(
versions = Version.objects.public(
user=request.user,
project=project,
only_active=False,
Expand Down
11 changes: 2 additions & 9 deletions readthedocs/rtd_tests/tests/test_project_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,25 +385,18 @@ def test_project_download_media(self):
response = self.client.get(url)
self.assertEqual(response.status_code, 302)

def test_project_detail_view_only_shows_internal_versons(self):
def test_project_detail_view_shows_external_versons(self):
url = reverse('projects_detail', args=[self.pip.slug])
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
self.assertNotIn(self.external_version, response.context['versions'])
self.assertIn(self.external_version, response.context['versions'])

def test_project_downloads_only_shows_internal_versons(self):
url = reverse('project_downloads', args=[self.pip.slug])
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
self.assertNotIn(self.external_version, response.context['versions'])

def test_project_versions_only_shows_internal_versons(self):
url = reverse('project_version_list', args=[self.pip.slug])
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
self.assertNotIn(self.external_version, response.context['active_versions'])
self.assertNotIn(self.external_version, response.context['inactive_versions'])


class TestPrivateViews(MockBuildTestCase):
def setUp(self):
Expand Down
5 changes: 2 additions & 3 deletions readthedocs/rtd_tests/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ def test_build_redirect(self, mock):
'/projects/pip/builds/%s/' % build.pk,
)

def test_build_list_does_not_include_external_versions(self):
def test_build_list_includes_external_versions(self):
external_version = get(
Version,
project = self.pip,
Expand All @@ -295,5 +295,4 @@ def test_build_list_does_not_include_external_versions(self):
)
self.assertEqual(response.status_code, 200)

self.assertNotIn(external_version_build, response.context['build_qs'])
self.assertNotIn(external_version_build, response.context['active_builds'])
self.assertIn(external_version_build, response.context['build_qs'])