diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py index 1801e7c8dc..bfe244820d 100644 --- a/cms/djangoapps/contentstore/tests/test_course_settings.py +++ b/cms/djangoapps/contentstore/tests/test_course_settings.py @@ -312,7 +312,7 @@ class CourseGradingTest(CourseTestCase): descriptor = get_modulestore(self.course.location).get_item(self.course.location) section_grader_type = CourseGradingModel.get_section_grader_type(self.course_locator) - self.assertEqual('Not Graded', section_grader_type['graderType']) + self.assertEqual('notgraded', section_grader_type['graderType']) self.assertEqual(None, descriptor.format) self.assertEqual(False, descriptor.graded) @@ -325,12 +325,12 @@ class CourseGradingTest(CourseTestCase): self.assertEqual('Homework', descriptor.format) self.assertEqual(True, descriptor.graded) - # Change the grader type back to Not Graded, which should also unmark the section as graded - CourseGradingModel.update_section_grader_type(self.course, 'Not Graded') + # Change the grader type back to notgraded, which should also unmark the section as graded + CourseGradingModel.update_section_grader_type(self.course, 'notgraded') descriptor = get_modulestore(self.course.location).get_item(self.course.location) section_grader_type = CourseGradingModel.get_section_grader_type(self.course_locator) - self.assertEqual('Not Graded', section_grader_type['graderType']) + self.assertEqual('notgraded', section_grader_type['graderType']) self.assertEqual(None, descriptor.format) self.assertEqual(False, descriptor.graded) @@ -406,10 +406,10 @@ class CourseGradingTest(CourseTestCase): response = self.client.get_json(grade_type_url + '?fields=graderType') self.assertEqual(json.loads(response.content).get('graderType'), u'Homework') # and unset - response = self.client.ajax_post(grade_type_url, {'graderType': u'Not Graded'}) + response = self.client.ajax_post(grade_type_url, {'graderType': u'notgraded'}) self.assertEqual(200, response.status_code) response = self.client.get_json(grade_type_url + '?fields=graderType') - self.assertEqual(json.loads(response.content).get('graderType'), u'Not Graded') + self.assertEqual(json.loads(response.content).get('graderType'), u'notgraded') class CourseMetadataEditingTest(CourseTestCase): diff --git a/cms/djangoapps/models/settings/course_grading.py b/cms/djangoapps/models/settings/course_grading.py index fbbb37450c..519323298b 100644 --- a/cms/djangoapps/models/settings/course_grading.py +++ b/cms/djangoapps/models/settings/course_grading.py @@ -173,13 +173,13 @@ class CourseGradingModel(object): old_location = loc_mapper().translate_locator_to_location(location) descriptor = get_modulestore(old_location).get_item(old_location) return { - "graderType": descriptor.format if descriptor.format is not None else 'Not Graded', + "graderType": descriptor.format if descriptor.format is not None else 'notgraded', "location": unicode(location), } @staticmethod def update_section_grader_type(descriptor, grader_type): - if grader_type is not None and grader_type != u"Not Graded": + if grader_type is not None and grader_type != u'notgraded': descriptor.format = grader_type descriptor.graded = True else: diff --git a/cms/static/js/models/assignment_grade.js b/cms/static/js/models/assignment_grade.js index 83f00a7d10..2b9effcb03 100644 --- a/cms/static/js/models/assignment_grade.js +++ b/cms/static/js/models/assignment_grade.js @@ -1,7 +1,7 @@ define(["backbone", "underscore"], function(Backbone, _) { var AssignmentGrade = Backbone.Model.extend({ defaults : { - graderType : null, // the type label (string). May be "Not Graded" which implies None. + graderType : null, // the type label (string). May be "notgraded" which implies None. locator : null // locator for the block }, idAttribute: 'locator', diff --git a/cms/static/js/views/overview_assignment_grader.js b/cms/static/js/views/overview_assignment_grader.js index b13181b5e4..e7facfe7b5 100644 --- a/cms/static/js/views/overview_assignment_grader.js +++ b/cms/static/js/views/overview_assignment_grader.js @@ -1,5 +1,6 @@ define(["js/views/baseview", "underscore", "gettext", "js/models/assignment_grade", "js/views/feedback_notification"], function(BaseView, _, gettext, AssignmentGrade, NotificationView) { + var l10nNotGraded = gettext('Not Graded'); var OverviewAssignmentGrader = BaseView.extend({ // instantiate w/ { graders : CourseGraderCollection, el : } events : { @@ -18,7 +19,9 @@ define(["js/views/baseview", "underscore", "gettext", "js/models/assignment_grad '<% graders.each(function(option) { %>' + '
  • class="is-selected" <%}%> href="#"><%= option.get("type") %>
    • ' + '<% }) %>' + - '
  • Not Graded
    • ' + + '
  • ' + + l10nNotGraded + + '
    • ' + ''); this.assignmentGrade = new AssignmentGrade({ locator : this.$el.closest('.id-holder').data('locator'), @@ -36,9 +39,15 @@ define(["js/views/baseview", "underscore", "gettext", "js/models/assignment_grad this.render(); }, render : function() { - this.$el.html(this.template({ assignmentType : this.assignmentGrade.get('graderType'), graders : this.graders, - hideSymbol : this.hideSymbol })); - if (this.assignmentGrade.has('graderType') && this.assignmentGrade.get('graderType') != "Not Graded") { + var graderType = this.assignmentGrade.get('graderType'); + this.$el.html(this.template( + { + assignmentType : (graderType == 'notgraded') ? l10nNotGraded : graderType, + graders : this.graders, + hideSymbol : this.hideSymbol + } + )); + if (this.assignmentGrade.has('graderType') && this.assignmentGrade.get('graderType') != "notgraded") { this.$el.addClass('is-set'); } else { @@ -64,10 +73,10 @@ define(["js/views/baseview", "underscore", "gettext", "js/models/assignment_grad saving.show(); // TODO I'm not happy with this string fetch via the html for what should be an id. I'd rather use the id attr - // of the CourseGradingPolicy model or null for Not Graded (NOTE, change template's if check for is-selected accordingly) + // of the CourseGradingPolicy model or null for notgraded (NOTE, change template's if check for is-selected accordingly) this.assignmentGrade.save( 'graderType', - $(e.target).text(), + ($(e.target).hasClass('gradable-status-notgraded')) ? 'notgraded' : $(e.target).text(), {success: function () { saving.hide(); }} ); diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index 7947d9dd43..be4c042bc7 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -62,7 +62,7 @@
    -
    +
    diff --git a/cms/templates/overview.html b/cms/templates/overview.html index c346f97e5c..e7aa8da9ad 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -228,7 +228,7 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v