Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json.

lms/djangoapps/courseware/course_settings.py

@@ -1,91 +0,0 @@
-"""
-Course settings module. All settings in the global_settings are
-first applied, and then any settings in the settings.DATA_DIR/course_settings.json
-are applied. A setting must be in ALL_CAPS.
-
-Settings are used by calling
-
-from courseware.course_settings import course_settings
-
-Note that courseware.course_settings.course_settings is not a module -- it's an object. So
-importing individual settings is not possible:
-
-from courseware.course_settings.course_settings import GRADER  # This won't work.
-
-"""
-import json
-import logging
-
-from django.conf import settings
-
-from xmodule import graders
-
-log = logging.getLogger("mitx.courseware")
-
-global_settings_json = """
-{
-    "GRADER" : [
-        {
-            "type" : "Homework",
-            "min_count" : 12,
-            "drop_count" : 2,
-            "short_label" : "HW",
-            "weight" : 0.15
-        },
-        {
-            "type" : "Lab",
-            "min_count" : 12,
-            "drop_count" : 2,
-            "category" : "Labs",
-            "weight" : 0.15
-        },
-        {
-            "type" : "Midterm",
-            "name" : "Midterm Exam",
-            "short_label" : "Midterm",
-            "weight" : 0.3
-        },
-        {
-            "type" : "Final",
-            "name" : "Final Exam",
-            "short_label" : "Final",
-            "weight" : 0.4
-        }
-    ],
-    "GRADE_CUTOFFS" : {
-        "A" : 0.87,
-        "B" : 0.7,
-        "C" : 0.6
-    }
-}
-"""
-
-
-class Settings(object):
-    def __init__(self):
-
-        # Load the global settings as a dictionary
-        global_settings = json.loads(global_settings_json)
-
-        # Load the course settings as a dictionary
-        course_settings = {}
-        try:
-            # TODO: this doesn't work with multicourse
-            with open(settings.DATA_DIR + "/course_settings.json") as course_settings_file:
-                course_settings_string = course_settings_file.read()
-            course_settings = json.loads(course_settings_string)
-        except IOError:
-            log.warning("Unable to load course settings file from " + str(settings.DATA_DIR) + "/course_settings.json")
-
-        # Override any global settings with the course settings
-        global_settings.update(course_settings)
-
-        # Now, set the properties from the course settings on ourselves
-        for setting in global_settings:
-            setting_value = global_settings[setting]
-            setattr(self, setting, setting_value)
-
-        # Here is where we should parse any configurations, so that we can fail early
-        self.GRADER = graders.grader_from_conf(self.GRADER)
-
-course_settings = Settings()

lms/djangoapps/courseware/grades.py

@@ -3,7 +3,6 @@ import logging
 
 from django.conf import settings
 
-from courseware.course_settings import course_settings
 from xmodule import graders
 from xmodule.graders import Score
 from models import StudentModule
@@ -11,7 +10,7 @@ from models import StudentModule
 _log = logging.getLogger("mitx.courseware")
 
 
-def grade_sheet(student, course, student_module_cache):
+def grade_sheet(student, course, grader, student_module_cache):
     """
     This pulls a summary of all problems in the course. It returns a dictionary with two datastructures:
 
@@ -78,7 +77,6 @@ def grade_sheet(student, course, student_module_cache):
                          'chapter': c.metadata.get('display_name'),
                          'sections': sections})
 
-    grader = course_settings.GRADER
     grade_summary = grader.grade(totaled_scores)
 
     return {'courseware_summary': chapters,

lms/djangoapps/courseware/views.py

@@ -19,7 +19,6 @@ from django.views.decorators.cache import cache_control
 from module_render import toc_for_course, get_module, get_section
 from models import StudentModuleCache
 from student.models import UserProfile
-from multicourse import multicourse_settings
 from xmodule.modulestore import Location
 from xmodule.modulestore.exceptions import InvalidLocationError, ItemNotFoundError, NoPathToItem
 from xmodule.modulestore.django import modulestore
@@ -110,8 +109,8 @@ def profile(request, course_id, student_id=None):
     user_info = UserProfile.objects.get(user=student)
 
     student_module_cache = StudentModuleCache(request.user, course)
-    course, _, _, _ = get_module(request.user, request, course.location, student_module_cache)
-
+    course_module, _, _, _ = get_module(request.user, request, course.location, student_module_cache)
+    
     context = {'name': user_info.name,
                'username': student.username,
                'location': user_info.location,
@@ -121,7 +120,7 @@ def profile(request, course_id, student_id=None):
                'format_url_params': format_url_params,
                'csrf': csrf(request)['csrf_token']
                }
-    context.update(grades.grade_sheet(student, course, student_module_cache))
+    context.update(grades.grade_sheet(student, course_module, course.grader, student_module_cache))
 
     return render_to_response('profile.html', context)
 
@@ -184,9 +183,6 @@ def index(request, course_id, chapter=None, section=None,
     chapter = clean(chapter)
     section = clean(section)
 
-    if settings.ENABLE_MULTICOURSE:
-        settings.MODULESTORE['default']['OPTIONS']['data_dir'] = settings.DATA_DIR + multicourse_settings.get_course_xmlpath(course)
-
     context = {
         'csrf': csrf(request)['csrf_token'],
         'accordion': render_accordion(request, course, chapter, section),