From 3ff344559c819837a7e6553c464421fdff09c408 Mon Sep 17 00:00:00 2001 From: Brandon DeRosier Date: Wed, 15 Jul 2015 16:31:59 -0400 Subject: [PATCH] Revert "Revert "Add feature flag for Import/Export API in LMS"" This reverts commit 783e83deb031b63298277ec13fbcffcbc7c157e3. --- lms/envs/common.py | 3 +++ lms/envs/test.py | 3 +++ lms/urls.py | 6 ++++++ .../core/djangoapps/import_export/courses/tests/utils.py | 8 ++++---- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lms/envs/common.py b/lms/envs/common.py index 98549ae664..db992165f0 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -418,6 +418,9 @@ FEATURES = { # Credit course API 'ENABLE_CREDIT_API': False, + # Full Course/Library Import/Export API + 'ENABLE_IMPORT_EXPORT_LMS': False, + # The block types to disable need to be specified in "x block disable config" in django admin. 'ENABLE_DISABLING_XBLOCK_TYPES': True, diff --git a/lms/envs/test.py b/lms/envs/test.py index c695f7700a..e2f47df42c 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -528,3 +528,6 @@ AUTHENTICATION_BACKENDS += ('lti_provider.users.LtiBackend',) # ORGANIZATIONS FEATURES['ORGANIZATIONS_APP'] = True + +# Enable the Full Course/Library Import/Export API +FEATURES['ENABLE_IMPORT_EXPORT_LMS'] = True diff --git a/lms/urls.py b/lms/urls.py index 19d7f09081..93e6a85923 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -88,6 +88,12 @@ urlpatterns = ( url(r'^api/commerce/', include('commerce.api.urls', namespace='commerce_api')), ) +# Full Course/Library Import/Export API +if settings.FEATURES["ENABLE_IMPORT_EXPORT_LMS"]: + urlpatterns += ( + url(r'^api/import_export/v1/', include('openedx.core.djangoapps.import_export.urls')), + ) + if settings.FEATURES["ENABLE_COMBINED_LOGIN_REGISTRATION"]: # Backwards compatibility with old URL structure, but serve the new views urlpatterns += ( diff --git a/openedx/core/djangoapps/import_export/courses/tests/utils.py b/openedx/core/djangoapps/import_export/courses/tests/utils.py index 5cb3f22f75..00f3d908a1 100644 --- a/openedx/core/djangoapps/import_export/courses/tests/utils.py +++ b/openedx/core/djangoapps/import_export/courses/tests/utils.py @@ -3,16 +3,16 @@ Utilities for contentstore tests ''' from datetime import timedelta - +from django.conf import settings from django.utils import timezone + +from provider.oauth2.models import AccessToken, Client as OAuth2Client +from provider import constants from rest_framework.test import APIClient from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory -from django.conf import settings -from provider.oauth2.models import AccessToken, Client as OAuth2Client -from provider import constants TEST_DATA_DIR = settings.COMMON_TEST_DATA_ROOT