Merge pull request #628 from MITx/feature/cale/manual-git-reload-feature-flag

Isolate manual git reload behind a feature flag

lms/djangoapps/instructor/views.py

@@ -88,6 +88,7 @@ def instructor_dashboard(request, course_id):
     # process actions from form POST
     action = request.POST.get('action', '')
 
+    if settings.MITX_FEATURES['ENABLE_MANUAL_GIT_RELOAD']:
         if 'GIT pull' in action:
             data_dir = course.metadata['data_dir']
             log.debug('git pull %s' % (data_dir))
@@ -115,7 +116,7 @@ def instructor_dashboard(request, course_id):
             except Exception as err:
                 msg += '<br/><p>Error: %s</p>' % escape(err)
 
-    elif action == 'Dump list of enrolled students':
+    if action == 'Dump list of enrolled students':
         log.debug(action)
         datatable = get_student_grade_summary_data(request, course, course_id, get_grades=False)
         datatable['title'] = 'List of students enrolled in %s' % course_id

lms/envs/common.py

@@ -73,6 +73,7 @@ MITX_FEATURES = {
 
     'ENABLE_SQL_TRACKING_LOGS': False,
     'ENABLE_LMS_MIGRATION': False,
+    'ENABLE_MANUAL_GIT_RELOAD': False,
 
     'DISABLE_LOGIN_BUTTON': False,  # used in systems where login is automatic, eg MIT SSL
 

lms/envs/dev.py

@@ -18,6 +18,7 @@ MITX_FEATURES['ENABLE_SQL_TRACKING_LOGS'] = True
 MITX_FEATURES['SUBDOMAIN_COURSE_LISTINGS'] = False  # Enable to test subdomains--otherwise, want all courses to show up
 MITX_FEATURES['SUBDOMAIN_BRANDING'] = True
 MITX_FEATURES['FORCE_UNIVERSITY_DOMAIN'] = None		# show all university courses if in dev (ie don't use HTTP_HOST)
+MITX_FEATURES['ENABLE_MANUAL_GIT_RELOAD'] = True
 
 WIKI_ENABLED = True
 

lms/templates/courseware/instructor_dashboard.html

@@ -71,7 +71,7 @@ table.stat_table td {
     <hr width="40%" style="align:left">
  %endif
  
-%if admin_access:
+%if settings.MITX_FEATURES['ENABLE_MANUAL_GIT_RELOAD'] and admin_access:
     <p>
     <input type="submit" name="action" value="Reload course from XML files"> 
     <input type="submit" name="action" value="GIT pull and Reload course">