From 97954d48fb4295409d665dee97c1904147875454 Mon Sep 17 00:00:00 2001 From: Michael Roytman Date: Tue, 23 Jan 2018 13:07:22 -0500 Subject: [PATCH] add condition for when no assets are found in the database --- cms/djangoapps/contentstore/views/assets.py | 2 +- cms/djangoapps/contentstore/views/tests/test_assets.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cms/djangoapps/contentstore/views/assets.py b/cms/djangoapps/contentstore/views/assets.py index 3abd21e556..a15c7e4229 100644 --- a/cms/djangoapps/contentstore/views/assets.py +++ b/cms/djangoapps/contentstore/views/assets.py @@ -138,7 +138,7 @@ def _assets_json(request, course_key): assets, total_count = _get_assets_for_page(course_key, query_options) - if request_options['requested_page'] > 0 and first_asset_to_display_index >= total_count: + if request_options['requested_page'] > 0 and first_asset_to_display_index >= total_count and total_count > 0: _update_options_to_requery_final_page(query_options, total_count) current_page = query_options['current_page'] first_asset_to_display_index = _get_first_asset_index(current_page, requested_page_size) diff --git a/cms/djangoapps/contentstore/views/tests/test_assets.py b/cms/djangoapps/contentstore/views/tests/test_assets.py index 0eb64734ca..90ccc60c2d 100644 --- a/cms/djangoapps/contentstore/views/tests/test_assets.py +++ b/cms/djangoapps/contentstore/views/tests/test_assets.py @@ -191,6 +191,10 @@ class PaginationTestCase(AssetsTestCase): self.url + "?page_size=2&page=2", 2, 2, 4) self.assert_correct_asset_response( self.url + "?page_size=3&page=1", 3, 1, 4) + self.assert_correct_asset_response( + self.url + "?page_size=1&page=5&asset_type=OTHER", 0, 1, 1) + self.assert_correct_asset_response( + self.url + "?page_size=1&page=5&asset_type=Images", 5, 0, 0) @mock.patch('xmodule.contentstore.mongo.MongoContentStore.get_all_content_for_course') def test_mocked_filtered_response(self, mock_get_all_content_for_course):