Skip to content

Commit 31041a3

Browse files
committed
add all versions and builds to version and build listing
1 parent a166563 commit 31041a3

File tree

4 files changed

+8
-15
lines changed

4 files changed

+8
-15
lines changed

readthedocs/builds/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def get_queryset(self):
9292
Project.objects.protected(self.request.user),
9393
slug=self.project_slug,
9494
)
95-
queryset = Build.internal.public(
95+
queryset = Build.objects.public(
9696
user=self.request.user,
9797
project=self.project,
9898
).select_related('project', 'version')

readthedocs/projects/views/public.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def get_context_data(self, **kwargs):
9393
context = super().get_context_data(**kwargs)
9494

9595
project = self.get_object()
96-
context['versions'] = Version.internal.public(
96+
context['versions'] = Version.objects.public(
9797
user=self.request.user,
9898
project=project,
9999
)
@@ -268,7 +268,7 @@ def project_versions(request, project_slug):
268268
slug=project_slug,
269269
)
270270

271-
versions = Version.internal.public(
271+
versions = Version.objects.public(
272272
user=request.user,
273273
project=project,
274274
only_active=False,

readthedocs/rtd_tests/tests/test_project_views.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -385,25 +385,18 @@ def test_project_download_media(self):
385385
response = self.client.get(url)
386386
self.assertEqual(response.status_code, 302)
387387

388-
def test_project_detail_view_only_shows_internal_versons(self):
388+
def test_project_detail_view_shows_external_versons(self):
389389
url = reverse('projects_detail', args=[self.pip.slug])
390390
response = self.client.get(url)
391391
self.assertEqual(response.status_code, 200)
392-
self.assertNotIn(self.external_version, response.context['versions'])
392+
self.assertIn(self.external_version, response.context['versions'])
393393

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

400-
def test_project_versions_only_shows_internal_versons(self):
401-
url = reverse('project_version_list', args=[self.pip.slug])
402-
response = self.client.get(url)
403-
self.assertEqual(response.status_code, 200)
404-
self.assertNotIn(self.external_version, response.context['active_versions'])
405-
self.assertNotIn(self.external_version, response.context['inactive_versions'])
406-
407400

408401
class TestPrivateViews(MockBuildTestCase):
409402
def setUp(self):

readthedocs/rtd_tests/tests/test_views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def test_build_redirect(self, mock):
278278
'/projects/pip/builds/%s/' % build.pk,
279279
)
280280

281-
def test_build_list_does_not_include_external_versions(self):
281+
def test_build_list_includes_external_versions(self):
282282
external_version = get(
283283
Version,
284284
project = self.pip,
@@ -295,5 +295,5 @@ def test_build_list_does_not_include_external_versions(self):
295295
)
296296
self.assertEqual(response.status_code, 200)
297297

298-
self.assertNotIn(external_version_build, response.context['build_qs'])
299-
self.assertNotIn(external_version_build, response.context['active_builds'])
298+
self.assertIn(external_version_build, response.context['build_qs'])
299+
self.assertIn(external_version_build, response.context['active_builds'])

0 commit comments

Comments
 (0)