diff --git a/cms/djangoapps/contentstore/config/models.py b/cms/djangoapps/contentstore/config/models.py index 5335a503f2..7eb060866d 100644 --- a/cms/djangoapps/contentstore/config/models.py +++ b/cms/djangoapps/contentstore/config/models.py @@ -27,12 +27,12 @@ class NewAssetsPageFlag(ConfigurationModel): There are 2 booleans to be concerned with - enabled_for_all_courses, and the implicit is_enabled(). They interact in the following ways: - - is_enabled: False, enabled_for_all_courses: True or False + - is_enabled(): False, enabled_for_all_courses: True or False - no one can use the feature. - - is_enabled: True, enabled_for_all_courses: False + - is_enabled(): True, enabled_for_all_courses: False - check for a CourseNewAssetsPageFlag, use that value (default False) - if no course_id provided, return False - - is_enabled: True, enabled_for_all_courses: True + - is_enabled(): True, enabled_for_all_courses: True - everyone can use the feature """ if not NewAssetsPageFlag.is_enabled(): diff --git a/cms/urls.py b/cms/urls.py index 4bf756f9d3..da45d2441b 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -5,11 +5,14 @@ from django.contrib.admin import autodiscover as django_autodiscover from django.utils.translation import ugettext_lazy as _ import contentstore.views +from contentstore.config.models import NewAssetsPageFlag +from cms.djangoapps.contentstore.views.organization import OrganizationListView import openedx.core.djangoapps.common_views.xblock import openedx.core.djangoapps.debug.views import openedx.core.djangoapps.external_auth.views import openedx.core.djangoapps.lang_pref.views -from cms.djangoapps.contentstore.views.organization import OrganizationListView + +from config_models.views import ConfigurationModelCurrentAPIView from ratelimitbackend import admin django_autodiscover() @@ -247,6 +250,10 @@ if 'debug_toolbar' in settings.INSTALLED_APPS: urlpatterns.append(url(r'^template/(?P