Commit 5b840434 by Omar Khan

Remove unused MULTIPLE_ENROLLMENT_ROLES feature setting

This feature check was commented out in 8ee9a967 more than 2 years ago,
we might as well remove the setting.
parent ddb2133f
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
"CERTIFICATES_ENABLED": true, "CERTIFICATES_ENABLED": true,
"CERTIFICATES_HTML_VIEW": true, "CERTIFICATES_HTML_VIEW": true,
"CERTIFICATES_INSTRUCTOR_GENERATION": true, "CERTIFICATES_INSTRUCTOR_GENERATION": true,
"MULTIPLE_ENROLLMENT_ROLES": true,
"ENABLE_PAYMENT_FAKE": true, "ENABLE_PAYMENT_FAKE": true,
"ENABLE_VERIFIED_CERTIFICATES": true, "ENABLE_VERIFIED_CERTIFICATES": true,
"ENABLE_DISCUSSION_SERVICE": true, "ENABLE_DISCUSSION_SERVICE": true,
......
...@@ -190,9 +190,6 @@ FEATURES = { ...@@ -190,9 +190,6 @@ FEATURES = {
# for load testing # for load testing
'AUTOMATIC_AUTH_FOR_TESTING': False, 'AUTOMATIC_AUTH_FOR_TESTING': False,
# Allow users to enroll with methods other than just honor code certificates
'MULTIPLE_ENROLLMENT_ROLES': False,
# Toggle the availability of the shopping cart page # Toggle the availability of the shopping cart page
'ENABLE_SHOPPING_CART': False, 'ENABLE_SHOPPING_CART': False,
......
...@@ -25,7 +25,6 @@ FEATURES['ENABLE_SERVICE_STATUS'] = True ...@@ -25,7 +25,6 @@ FEATURES['ENABLE_SERVICE_STATUS'] = True
FEATURES['ENABLE_INSTRUCTOR_EMAIL'] = True # Enable email for all Studio courses FEATURES['ENABLE_INSTRUCTOR_EMAIL'] = True # Enable email for all Studio courses
FEATURES['REQUIRE_COURSE_EMAIL_AUTH'] = False # Give all courses email (don't require django-admin perms) FEATURES['REQUIRE_COURSE_EMAIL_AUTH'] = False # Give all courses email (don't require django-admin perms)
FEATURES['ENABLE_HINTER_INSTRUCTOR_VIEW'] = True FEATURES['ENABLE_HINTER_INSTRUCTOR_VIEW'] = True
FEATURES['MULTIPLE_ENROLLMENT_ROLES'] = True
FEATURES['ENABLE_SHOPPING_CART'] = True FEATURES['ENABLE_SHOPPING_CART'] = True
FEATURES['AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING'] = True FEATURES['AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING'] = True
FEATURES['ENABLE_S3_GRADE_DOWNLOADS'] = True FEATURES['ENABLE_S3_GRADE_DOWNLOADS'] = True
......
...@@ -8,7 +8,6 @@ from django.views.generic.base import RedirectView ...@@ -8,7 +8,6 @@ from django.views.generic.base import RedirectView
from ratelimitbackend import admin from ratelimitbackend import admin
from django.conf.urls.static import static from django.conf.urls.static import static
import django.contrib.auth.views
from microsite_configuration import microsite from microsite_configuration import microsite
import auth_exchange.views import auth_exchange.views
...@@ -103,6 +102,11 @@ urlpatterns = ( ...@@ -103,6 +102,11 @@ urlpatterns = (
url(r'^api/credit/', include('openedx.core.djangoapps.credit.urls', app_name="credit", namespace='credit')), url(r'^api/credit/', include('openedx.core.djangoapps.credit.urls', app_name="credit", namespace='credit')),
url(r'^rss_proxy/', include('rss_proxy.urls', namespace='rss_proxy')), url(r'^rss_proxy/', include('rss_proxy.urls', namespace='rss_proxy')),
url(r'^api/organizations/', include('organizations.urls', namespace='organizations')), url(r'^api/organizations/', include('organizations.urls', namespace='organizations')),
# Multiple course modes and identity verification
# TODO Namespace these!
url(r'^course_modes/', include('course_modes.urls')),
url(r'^verify_student/', include('verify_student.urls')),
) )
if settings.FEATURES["ENABLE_COMBINED_LOGIN_REGISTRATION"]: if settings.FEATURES["ENABLE_COMBINED_LOGIN_REGISTRATION"]:
...@@ -125,13 +129,6 @@ if settings.FEATURES["ENABLE_MOBILE_REST_API"]: ...@@ -125,13 +129,6 @@ if settings.FEATURES["ENABLE_MOBILE_REST_API"]:
url(r'^api/mobile/v0.5/', include('mobile_api.urls')), url(r'^api/mobile/v0.5/', include('mobile_api.urls')),
) )
# if settings.FEATURES.get("MULTIPLE_ENROLLMENT_ROLES"):
urlpatterns += (
# TODO Namespace these!
url(r'^verify_student/', include('verify_student.urls')),
url(r'^course_modes/', include('course_modes.urls')),
)
js_info_dict = { js_info_dict = {
'domain': 'djangojs', 'domain': 'djangojs',
# We need to explicitly include external Django apps that are not in LOCALE_PATHS. # We need to explicitly include external Django apps that are not in LOCALE_PATHS.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment