diff --git a/cms/static/coffee/spec/main.coffee b/cms/static/coffee/spec/main.coffee index b23e7255fd..3fdb216e37 100644 --- a/cms/static/coffee/spec/main.coffee +++ b/cms/static/coffee/spec/main.coffee @@ -141,6 +141,7 @@ define([ "coffee/spec/models/course_spec", "coffee/spec/models/metadata_spec", "coffee/spec/models/module_spec", "coffee/spec/models/section_spec", + "coffee/spec/models/settings_course_grader_spec", "coffee/spec/models/settings_grading_spec", "coffee/spec/models/textbook_spec", "coffee/spec/models/upload_spec", diff --git a/cms/static/coffee/spec/models/settings_course_grader_spec.coffee b/cms/static/coffee/spec/models/settings_course_grader_spec.coffee new file mode 100644 index 0000000000..f6252a3590 --- /dev/null +++ b/cms/static/coffee/spec/models/settings_course_grader_spec.coffee @@ -0,0 +1,20 @@ +define ["js/models/settings/course_grader"], (CourseGrader) -> + describe "CourseGraderModel", -> + describe "parseWeight", -> + it "converts a float to an integer", -> + model = new CourseGrader({weight: 7.0001, min_count: 3.67, drop_count: 1.88}, {parse:true}) + expect(model.get('weight')).toBe(7) + expect(model.get('min_count')).toBe(3) + expect(model.get('drop_count')).toBe(1) + + it "converts a string to an integer", -> + model = new CourseGrader({weight: '7.0001', min_count: '3.67', drop_count: '1.88'}, {parse:true}) + expect(model.get('weight')).toBe(7) + expect(model.get('min_count')).toBe(3) + expect(model.get('drop_count')).toBe(1) + + it "does a no-op for integers", -> + model = new CourseGrader({weight: 7, min_count: 3, drop_count: 1}, {parse:true}) + expect(model.get('weight')).toBe(7) + expect(model.get('min_count')).toBe(3) + expect(model.get('drop_count')).toBe(1) diff --git a/cms/static/js/models/settings/course_grader.js b/cms/static/js/models/settings/course_grader.js index d04438bdff..a915c5f0ec 100644 --- a/cms/static/js/models/settings/course_grader.js +++ b/cms/static/js/models/settings/course_grader.js @@ -10,13 +10,13 @@ var CourseGrader = Backbone.Model.extend({ }, parse : function(attrs) { if (attrs['weight']) { - if (!_.isNumber(attrs.weight)) attrs.weight = parseInt(attrs.weight, 10); + attrs.weight = parseInt(attrs.weight, 10); } if (attrs['min_count']) { - if (!_.isNumber(attrs.min_count)) attrs.min_count = parseInt(attrs.min_count, 10); + attrs.min_count = parseInt(attrs.min_count, 10); } if (attrs['drop_count']) { - if (!_.isNumber(attrs.drop_count)) attrs.drop_count = parseInt(attrs.drop_count, 10); + attrs.drop_count = parseInt(attrs.drop_count, 10); } return attrs; }, diff --git a/cms/static/js/models/settings/course_grading_policy.js b/cms/static/js/models/settings/course_grading_policy.js index 7d16b61426..3ae901920d 100644 --- a/cms/static/js/models/settings/course_grading_policy.js +++ b/cms/static/js/models/settings/course_grading_policy.js @@ -20,7 +20,7 @@ var CourseGradingPolicy = Backbone.Model.extend({ graderCollection.reset(attributes.graders); } else { - graderCollection = new CourseGraderCollection(attributes.graders); + graderCollection = new CourseGraderCollection(attributes.graders, {parse:true}); graderCollection.course_location = attributes['course_location'] || this.get('course_location'); } attributes.graders = graderCollection; diff --git a/cms/templates/edit_subsection.html b/cms/templates/edit_subsection.html index 3ed4f6552e..8a4d61806c 100644 --- a/cms/templates/edit_subsection.html +++ b/cms/templates/edit_subsection.html @@ -114,9 +114,8 @@ require(["domReady!", "jquery", "js/models/location", "js/views/overview_assignm // I believe that current (New Section/New Subsection) cause full page reloads which means these aren't needed globally // but we really should change that behavior. if (!window.graderTypes) { - window.graderTypes = new CourseGraderCollection(); + window.graderTypes = new CourseGraderCollection(${course_graders|n}, {parse:true}); window.graderTypes.course_location = new Location('${parent_location}'); - window.graderTypes.reset(${course_graders|n}); } $(".gradable-status").each(function(index, ele) { diff --git a/cms/templates/overview.html b/cms/templates/overview.html index cfdb603107..5d75e3922a 100644 --- a/cms/templates/overview.html +++ b/cms/templates/overview.html @@ -25,9 +25,8 @@ require(["domReady!", "jquery", "js/models/location", "js/models/section", "js/v // I believe that current (New Section/New Subsection) cause full page reloads which means these aren't needed globally // but we really should change that behavior. if (!window.graderTypes) { - window.graderTypes = new CourseGraderCollection(); + window.graderTypes = new CourseGraderCollection(${course_graders|n}, {parse:true}); window.graderTypes.course_location = new Location('${parent_location}'); - window.graderTypes.reset(${course_graders|n}); } $(".gradable-status").each(function(index, ele) {