Merge pull request #17392 from mitodl/hack18_bookmarks_django_plugin

Changed 'bookmarks' django app to follow plugin pattern

cms/envs/common.py

@@ -975,9 +975,6 @@ INSTALLED_APPS = [
     # Monitor the status of services
     'openedx.core.djangoapps.service_status',
 
-    # Bookmarks
-    'openedx.core.djangoapps.bookmarks.apps.BookmarksConfig',
-
     # Video module configs (This will be moved to Video once it becomes an XBlock)
     'openedx.core.djangoapps.video_config',
 

lms/envs/aws.py

@@ -930,9 +930,6 @@ MICROSITE_DATABASE_TEMPLATE_CACHE_TTL = ENV_TOKENS.get(
     "MICROSITE_DATABASE_TEMPLATE_CACHE_TTL", MICROSITE_DATABASE_TEMPLATE_CACHE_TTL
 )
 
-# Course Content Bookmarks Settings
-MAX_BOOKMARKS_PER_COURSE = ENV_TOKENS.get('MAX_BOOKMARKS_PER_COURSE', MAX_BOOKMARKS_PER_COURSE)
-
 # Offset for pk of courseware.StudentModuleHistoryExtended
 STUDENTMODULEHISTORYEXTENDED_OFFSET = ENV_TOKENS.get(
     'STUDENTMODULEHISTORYEXTENDED_OFFSET', STUDENTMODULEHISTORYEXTENDED_OFFSET

lms/envs/common.py

@@ -2123,9 +2123,6 @@ INSTALLED_APPS = [
     # edX Video Pipeline integration
     'openedx.core.djangoapps.video_pipeline',
 
-    # Bookmarks
-    'openedx.core.djangoapps.bookmarks.apps.BookmarksConfig',
-
     # Our courseware
     'courseware',
     'student',
@@ -3288,9 +3285,6 @@ CCX_MAX_STUDENTS_ALLOWED = 200
 FINANCIAL_ASSISTANCE_MIN_LENGTH = 800
 FINANCIAL_ASSISTANCE_MAX_LENGTH = 2500
 
-# Course Content Bookmarks Settings
-MAX_BOOKMARKS_PER_COURSE = 100
-
 #### Registration form extension. ####
 # Only used if combined login/registration is enabled.
 # This can be used to add fields to the registration page.

lms/urls.py

@@ -107,9 +107,6 @@ urlpatterns = [
     # User API endpoints
     url(r'^api/user/', include('openedx.core.djangoapps.user_api.urls')),
 
-    # Bookmarks API endpoints
-    url(r'^api/bookmarks/', include('openedx.core.djangoapps.bookmarks.urls')),
-
     # Profile Images API endpoints
     url(r'^api/profile_images/', include('openedx.core.djangoapps.profile_images.urls')),
 
@@ -647,7 +644,7 @@ urlpatterns += [
         include('openedx.features.course_experience.urls'),
     ),
 
-    # Course bookmarks
+    # Course bookmarks UI in LMS
     url(
         r'^courses/{}/bookmarks/'.format(
             settings.COURSE_ID_PATTERN,

openedx/core/djangoapps/bookmarks/apps.py

@@ -2,6 +2,8 @@
 Configuration for bookmarks Django app
 """
 from django.apps import AppConfig
+from django.utils.translation import ugettext_lazy as _
+from openedx.core.djangoapps.plugins.constants import ProjectType, SettingsType, PluginURLs, PluginSettings
 
 
 class BookmarksConfig(AppConfig):
@@ -9,7 +11,23 @@ class BookmarksConfig(AppConfig):
     Configuration class for bookmarks Django app
     """
     name = 'openedx.core.djangoapps.bookmarks'
-    verbose_name = "Bookmarks"
+    verbose_name = _("Bookmarks")
+
+    plugin_app = {
+        PluginURLs.CONFIG: {
+            ProjectType.LMS: {
+                PluginURLs.NAMESPACE: u'',
+                PluginURLs.REGEX: u'api/bookmarks/',
+                PluginURLs.RELATIVE_PATH: u'urls',
+            }
+        },
+        PluginSettings.CONFIG: {
+            ProjectType.LMS: {
+                SettingsType.AWS: {PluginSettings.RELATIVE_PATH: u'settings.aws'},
+                SettingsType.COMMON: {PluginSettings.RELATIVE_PATH: u'settings.common'},
+            }
+        }
+    }
 
     def ready(self):
         # Register the signals handled by bookmarks.

openedx/core/djangoapps/bookmarks/settings/aws.py

@@ -0,0 +1,6 @@
+def plugin_settings(settings):
+    # Course Content Bookmarks Settings
+    settings.MAX_BOOKMARKS_PER_COURSE = settings.ENV_TOKENS.get(
+        'MAX_BOOKMARKS_PER_COURSE',
+        settings.MAX_BOOKMARKS_PER_COURSE
+    )

openedx/core/djangoapps/bookmarks/settings/common.py

@@ -0,0 +1,3 @@
+def plugin_settings(settings):
+    # Course Content Bookmarks Settings
+    settings.MAX_BOOKMARKS_PER_COURSE = 100

setup.py

@@ -58,7 +58,7 @@ setup(
             "course_blocks_api = lms.djangoapps.course_api.blocks.transformers.blocks_api:BlocksAPITransformer",
             "milestones = lms.djangoapps.course_api.blocks.transformers.milestones:MilestonesAndSpecialExamsTransformer",
             "grades = lms.djangoapps.grades.transformer:GradesTransformer",
-            "completion = lms.djangoapps.course_api.blocks.transformers.block_completion:BlockCompletionTransformer"
+            "completion = lms.djangoapps.course_api.blocks.transformers.block_completion:BlockCompletionTransformer",
         ],
         "openedx.ace.policy": [
             "bulk_email_optout = lms.djangoapps.bulk_email.policies:CourseEmailOptout"
@@ -69,12 +69,15 @@ setup(
             "plugins = openedx.core.djangoapps.plugins.apps:PluginsConfig",
             "schedules = openedx.core.djangoapps.schedules.apps:SchedulesConfig",
             "theming = openedx.core.djangoapps.theming.apps:ThemingConfig",
+            "instructor = lms.djangoapps.instructor.apps:InstructorConfig",
+            "bookmarks = openedx.core.djangoapps.bookmarks.apps:BookmarksConfig",
         ],
         "cms.djangoapp": [
             "ace_common = openedx.core.djangoapps.ace_common.apps:AceCommonConfig",
             "plugins = openedx.core.djangoapps.plugins.apps:PluginsConfig",
             "schedules = openedx.core.djangoapps.schedules.apps:SchedulesConfig",
             "theming = openedx.core.djangoapps.theming.apps:ThemingConfig",
+            "bookmarks = openedx.core.djangoapps.bookmarks.apps:BookmarksConfig",
         ],
     }
 )