mattdrayer/api-signal-flag-common-aws: Added feature flag to settings files

lms/djangoapps/gradebook/management/commands/generate_gradebook_entries.py

@@ -10,7 +10,7 @@ from courseware import grades
 from gradebook.models import StudentGradebook
 from student.models import CourseEnrollment
 from xmodule.modulestore.django import modulestore
-from util.request import RequestMock
+from util.request import RequestMockWithoutMiddleware
 
 log = logging.getLogger(__name__)
 
@@ -65,10 +65,9 @@ class Command(BaseCommand):
 
             # For each user...
             for user in users:
-                request = RequestMock().get('/')
+                request = RequestMockWithoutMiddleware().get('/')
                 request.user = user
                 grade_data = grades.grade(user, request, course)
-                print grade_data
                 grade = grade_data['percent']
                 try:
                     gradebook_entry = StudentGradebook.objects.get(user=user, course_id=course.id)

lms/djangoapps/gradebook/receivers.py

@@ -5,7 +5,7 @@ from django.dispatch import receiver
 
 from courseware import grades
 from courseware.signals import score_changed
-from util.request import RequestMock
+from util.request import RequestMockWithoutMiddleware
 
 from gradebook.models import StudentGradebook
 
@@ -13,14 +13,14 @@ from gradebook.models import StudentGradebook
 @receiver(score_changed)
 def on_score_changed(sender, **kwargs):
     """
-    Listens for an 'on_score_changed' signal and when observed
+    Listens for a  'score_changed' signal and when observed
     recalculates the specified user's gradebook entry
     """
     from courseware.views import get_course
     user = kwargs['user']
     course_key = kwargs['course_key']
     course_descriptor = get_course(course_key, depth=None)
-    request = RequestMock().get('/')
+    request = RequestMockWithoutMiddleware().get('/')
     request.user = user
     grade_data = grades.grade(user, request, course_descriptor)
     grade = grade_data['percent']

lms/envs/aws.py

@@ -708,10 +708,6 @@ if FEATURES.get('ENABLE_LTI_PROVIDER'):
 if FEATURES.get('STUDENT_GRADEBOOK') and "'gradebook'" not in INSTALLED_APPS:
     INSTALLED_APPS += ('gradebook',)
 
-##### SET THE LIST OF ALLOWED IP ADDRESSES FOR THE API ######
-API_ALLOWED_IP_ADDRESSES = ENV_TOKENS.get('API_ALLOWED_IP_ADDRESSES')
-
 EXCLUDE_MIDDLEWARE_CLASSES = ENV_TOKENS.get('EXCLUDE_MIDDLEWARE_CLASSES', [])
 
 MIDDLEWARE_CLASSES = tuple(_class for _class in MIDDLEWARE_CLASSES if _class not in EXCLUDE_MIDDLEWARE_CLASSES)
->>>>>>> b103b35... cdodge/make-some-middleware-optional: allow for runtimes to specify which pieces of middleware should be removed. This helps with some performance characteristics.

lms/envs/common.py

@@ -423,7 +423,15 @@ FEATURES = {
     'ENABLE_DISABLING_XBLOCK_TYPES': True,
 
     # Whether an xBlock publishing a 'grade' event should be considered a 'progress' event as well
-    'MARK_PROGRESS_ON_GRADING_EVENT': False
+    'MARK_PROGRESS_ON_GRADING_EVENT': False,
+
+    # Broadcast score changes to the rest of the system
+    'SIGNAL_ON_SCORE_CHANGED': False,
+
+    # Enable the Student Gradebook, which is essentially a cache of calculated grades
+    # In order to use the gradebook, you must add it to the list of INSTALLED_APPS in
+    # addition to setting the flag to True here.  A reference is available in aws.py
+    'STUDENT_GRADEBOOK': False,
 }
 
 # Ignore static asset files on import which match this pattern

lms/envs/test.py

@@ -518,6 +518,6 @@ FEATURES['SIGNAL_ON_SCORE_CHANGED'] = True
 
 ############# Student Gradebook #################
 FEATURES['STUDENT_GRADEBOOK'] = True
-if FEATURES.get('STUDENT_GRADEBOOK', False):
+if FEATURES.get('STUDENT_GRADEBOOK', False) and "'gradebook'" not in INSTALLED_APPS:
     INSTALLED_APPS += ('gradebook',)