Commit 2ee80e84 by stv

Remove COURSEWARE_ENABLED flag

Per Dave Ormsbee:
> That was from way back when, when we actually had Django server pools,
> proxied differently by nginx; one was the courseware, and the other
> was askbot, a discussion forum.
>
> They shared all the same code, but different parts were live. It was
> about as good an idea as it sounds.
>
> There is no reason that I can think of in the current day and age where
> you would ever want to run the LMS and *turn off courseware*.
parent 1f2f3de4
...@@ -51,7 +51,7 @@ def index(request): ...@@ -51,7 +51,7 @@ def index(request):
Redirects to main page -- info page if user authenticated, or marketing if not Redirects to main page -- info page if user authenticated, or marketing if not
''' '''
if settings.COURSEWARE_ENABLED and request.user.is_authenticated(): if request.user.is_authenticated():
# For microsites, only redirect to dashboard if user has # For microsites, only redirect to dashboard if user has
# courses in his/her dashboard. Otherwise UX is a bit cryptic. # courses in his/her dashboard. Otherwise UX is a bit cryptic.
# In this case, we want to have the user stay on a course catalog # In this case, we want to have the user stay on a course catalog
......
...@@ -54,7 +54,6 @@ COPYRIGHT_YEAR = "2015" ...@@ -54,7 +54,6 @@ COPYRIGHT_YEAR = "2015"
PLATFORM_FACEBOOK_ACCOUNT = "http://www.facebook.com/YourPlatformFacebookAccount" PLATFORM_FACEBOOK_ACCOUNT = "http://www.facebook.com/YourPlatformFacebookAccount"
PLATFORM_TWITTER_ACCOUNT = "@YourPlatformTwitterAccount" PLATFORM_TWITTER_ACCOUNT = "@YourPlatformTwitterAccount"
COURSEWARE_ENABLED = True
ENABLE_JASMINE = False ENABLE_JASMINE = False
DISCUSSION_SETTINGS = { DISCUSSION_SETTINGS = {
......
...@@ -238,8 +238,7 @@ if settings.WIKI_ENABLED: ...@@ -238,8 +238,7 @@ if settings.WIKI_ENABLED:
url(r'^courses/{}/wiki/'.format(settings.COURSE_KEY_REGEX), include(wiki_pattern())), url(r'^courses/{}/wiki/'.format(settings.COURSE_KEY_REGEX), include(wiki_pattern())),
) )
if settings.COURSEWARE_ENABLED: COURSE_URLS = patterns(
COURSE_URLS = patterns(
'', '',
url( url(
r'^look_up_registration_code$', r'^look_up_registration_code$',
...@@ -251,8 +250,8 @@ if settings.COURSEWARE_ENABLED: ...@@ -251,8 +250,8 @@ if settings.COURSEWARE_ENABLED:
'instructor.views.registration_codes.registration_code_details', 'instructor.views.registration_codes.registration_code_details',
name='registration_code_details' name='registration_code_details'
) )
) )
urlpatterns += ( urlpatterns += (
# jump_to URLs for direct access to a location in the course # jump_to URLs for direct access to a location in the course
url( url(
r'^courses/{}/jump_to/(?P<location>.*)$'.format(settings.COURSE_ID_PATTERN), r'^courses/{}/jump_to/(?P<location>.*)$'.format(settings.COURSE_ID_PATTERN),
...@@ -476,9 +475,9 @@ if settings.COURSEWARE_ENABLED: ...@@ -476,9 +475,9 @@ if settings.COURSEWARE_ENABLED:
include('edxnotes.urls'), name="edxnotes_endpoints"), include('edxnotes.urls'), name="edxnotes_endpoints"),
url(r'^api/branding/v1/', include('branding.api_urls')), url(r'^api/branding/v1/', include('branding.api_urls')),
) )
if settings.FEATURES["ENABLE_TEAMS"]: if settings.FEATURES["ENABLE_TEAMS"]:
# Teams endpoints # Teams endpoints
urlpatterns += ( urlpatterns += (
url(r'^api/team/', include('lms.djangoapps.teams.api_urls')), url(r'^api/team/', include('lms.djangoapps.teams.api_urls')),
...@@ -486,20 +485,20 @@ if settings.COURSEWARE_ENABLED: ...@@ -486,20 +485,20 @@ if settings.COURSEWARE_ENABLED:
include('lms.djangoapps.teams.urls'), name="teams_endpoints"), include('lms.djangoapps.teams.urls'), name="teams_endpoints"),
) )
# allow course staff to change to student view of courseware # allow course staff to change to student view of courseware
if settings.FEATURES.get('ENABLE_MASQUERADE'): if settings.FEATURES.get('ENABLE_MASQUERADE'):
urlpatterns += ( urlpatterns += (
url(r'^courses/{}/masquerade$'.format(settings.COURSE_KEY_PATTERN), url(r'^courses/{}/masquerade$'.format(settings.COURSE_KEY_PATTERN),
'courseware.masquerade.handle_ajax', name="masquerade_update"), 'courseware.masquerade.handle_ajax', name="masquerade_update"),
) )
urlpatterns += ( urlpatterns += (
url(r'^courses/{}/generate_user_cert'.format(settings.COURSE_ID_PATTERN), url(r'^courses/{}/generate_user_cert'.format(settings.COURSE_ID_PATTERN),
'courseware.views.generate_user_cert', name="generate_user_cert"), 'courseware.views.generate_user_cert', name="generate_user_cert"),
) )
# discussion forums live within courseware, so courseware must be enabled first # discussion forums live within courseware, so courseware must be enabled first
if settings.FEATURES.get('ENABLE_DISCUSSION_SERVICE'): if settings.FEATURES.get('ENABLE_DISCUSSION_SERVICE'):
urlpatterns += ( urlpatterns += (
url(r'^api/discussion/', include('discussion_api.urls')), url(r'^api/discussion/', include('discussion_api.urls')),
url(r'^courses/{}/discussion/'.format(settings.COURSE_ID_PATTERN), url(r'^courses/{}/discussion/'.format(settings.COURSE_ID_PATTERN),
...@@ -512,13 +511,13 @@ if settings.COURSEWARE_ENABLED: ...@@ -512,13 +511,13 @@ if settings.COURSEWARE_ENABLED:
url(r'^notification_prefs/resubscribe/(?P<token>[a-zA-Z0-9-_=]+)/', url(r'^notification_prefs/resubscribe/(?P<token>[a-zA-Z0-9-_=]+)/',
'notification_prefs.views.set_subscription', {'subscribe': True}, name="resubscribe_forum_update"), 'notification_prefs.views.set_subscription', {'subscribe': True}, name="resubscribe_forum_update"),
) )
urlpatterns += ( urlpatterns += (
# This MUST be the last view in the courseware--it's a catch-all for custom tabs. # This MUST be the last view in the courseware--it's a catch-all for custom tabs.
url(r'^courses/{}/(?P<tab_slug>[^/]+)/$'.format(settings.COURSE_ID_PATTERN), url(r'^courses/{}/(?P<tab_slug>[^/]+)/$'.format(settings.COURSE_ID_PATTERN),
'courseware.views.static_tab', name="static_tab"), 'courseware.views.static_tab', name="static_tab"),
) )
if settings.FEATURES.get('ENABLE_STUDENT_HISTORY_VIEW'): if settings.FEATURES.get('ENABLE_STUDENT_HISTORY_VIEW'):
urlpatterns += ( urlpatterns += (
url( url(
r'^courses/{}/submission_history/(?P<student_username>[^/]*)/(?P<location>.*?)$'.format( r'^courses/{}/submission_history/(?P<student_username>[^/]*)/(?P<location>.*?)$'.format(
...@@ -529,7 +528,7 @@ if settings.COURSEWARE_ENABLED: ...@@ -529,7 +528,7 @@ if settings.COURSEWARE_ENABLED:
) )
if settings.COURSEWARE_ENABLED and settings.FEATURES.get('ENABLE_INSTRUCTOR_LEGACY_DASHBOARD'): if settings.FEATURES.get('ENABLE_INSTRUCTOR_LEGACY_DASHBOARD'):
urlpatterns += ( urlpatterns += (
url(r'^courses/{}/legacy_instructor_dash$'.format(settings.COURSE_ID_PATTERN), url(r'^courses/{}/legacy_instructor_dash$'.format(settings.COURSE_ID_PATTERN),
'instructor.views.legacy.instructor_dashboard', name="instructor_dashboard_legacy"), 'instructor.views.legacy.instructor_dashboard', name="instructor_dashboard_legacy"),
......
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