diff --git a/lms/djangoapps/bookmarks/__init__.py b/lms/djangoapps/bookmarks/__init__.py index 0c5079caea..d5046012e2 100644 --- a/lms/djangoapps/bookmarks/__init__.py +++ b/lms/djangoapps/bookmarks/__init__.py @@ -6,6 +6,7 @@ DEFAULT_FIELDS = [ 'id', 'course_id', 'usage_id', + 'block_type', 'created', ] diff --git a/lms/djangoapps/bookmarks/serializers.py b/lms/djangoapps/bookmarks/serializers.py index daf09ec419..1a302c1395 100644 --- a/lms/djangoapps/bookmarks/serializers.py +++ b/lms/djangoapps/bookmarks/serializers.py @@ -14,6 +14,7 @@ class BookmarkSerializer(serializers.ModelSerializer): id = serializers.SerializerMethodField('resource_id') # pylint: disable=invalid-name course_id = serializers.Field(source='course_key') usage_id = serializers.Field(source='usage_key') + block_type = serializers.Field(source='usage_key.block_type') path = serializers.Field(source='path') def __init__(self, *args, **kwargs): @@ -38,6 +39,7 @@ class BookmarkSerializer(serializers.ModelSerializer): 'id', 'course_id', 'usage_id', + 'block_type', 'display_name', 'path', 'created', diff --git a/lms/djangoapps/bookmarks/tests/test_api.py b/lms/djangoapps/bookmarks/tests/test_api.py index 796d678d33..3fc878c5a3 100644 --- a/lms/djangoapps/bookmarks/tests/test_api.py +++ b/lms/djangoapps/bookmarks/tests/test_api.py @@ -75,6 +75,7 @@ class BookmarksAPITests(ModuleStoreTestCase): self.assertEqual(response_data['id'], '%s,%s' % (self.user.username, unicode(bookmark.usage_key))) self.assertEqual(response_data['course_id'], unicode(bookmark.course_key)) self.assertEqual(response_data['usage_id'], unicode(bookmark.usage_key)) + self.assertEqual(response_data['block_type'], unicode(bookmark.usage_key.block_type)) self.assertIsNotNone(response_data['created']) if optional_fields: diff --git a/lms/djangoapps/bookmarks/tests/test_services.py b/lms/djangoapps/bookmarks/tests/test_services.py index 25b6a93543..bc6cae4097 100644 --- a/lms/djangoapps/bookmarks/tests/test_services.py +++ b/lms/djangoapps/bookmarks/tests/test_services.py @@ -54,6 +54,7 @@ class BookmarksAPITests(ModuleStoreTestCase): self.assertEqual(response_data['id'], '%s,%s' % (self.user.username, unicode(bookmark.usage_key))) self.assertEqual(response_data['course_id'], unicode(bookmark.course_key)) self.assertEqual(response_data['usage_id'], unicode(bookmark.usage_key)) + self.assertEqual(response_data['block_type'], unicode(bookmark.usage_key.block_type)) self.assertIsNotNone(response_data['created']) self.assertEqual(response_data['display_name'], bookmark.display_name) diff --git a/lms/djangoapps/bookmarks/tests/test_views.py b/lms/djangoapps/bookmarks/tests/test_views.py index 2cfbeba866..9778294057 100644 --- a/lms/djangoapps/bookmarks/tests/test_views.py +++ b/lms/djangoapps/bookmarks/tests/test_views.py @@ -108,6 +108,7 @@ class BookmarksViewTestsMixin(ModuleStoreTestCase): self.assertEqual(response_data['id'], '%s,%s' % (self.user.username, unicode(bookmark.usage_key))) self.assertEqual(response_data['course_id'], unicode(bookmark.course_key)) self.assertEqual(response_data['usage_id'], unicode(bookmark.usage_key)) + self.assertEqual(response_data['block_type'], unicode(bookmark.usage_key.block_type)) self.assertIsNotNone(response_data['created']) if optional_fields: