From 46ea862f04d8f1c0c3935caa782344e9a9309dfc Mon Sep 17 00:00:00 2001 From: Peter Fogg Date: Fri, 26 Jun 2015 13:48:24 -0400 Subject: [PATCH] Fix not being able to set course passing grades above 80%. --- cms/static/js/models/settings/course_grading_policy.js | 2 +- cms/templates/settings_graders.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cms/static/js/models/settings/course_grading_policy.js b/cms/static/js/models/settings/course_grading_policy.js index 258996c107..3751d91e7e 100644 --- a/cms/static/js/models/settings/course_grading_policy.js +++ b/cms/static/js/models/settings/course_grading_policy.js @@ -76,7 +76,7 @@ var CourseGradingPolicy = Backbone.Model.extend({ } } } - if(_.has(attrs, 'minimum_grade_credit')) { + if(this.get('is_credit_course') && _.has(attrs, 'minimum_grade_credit')) { var minimum_grade_cutoff = _.values(attrs.grade_cutoffs).pop(); if(isNaN(attrs.minimum_grade_credit) || attrs.minimum_grade_credit === null || attrs.minimum_grade_credit < minimum_grade_cutoff) { return { diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html index dd2281c791..13871988e1 100644 --- a/cms/templates/settings_graders.html +++ b/cms/templates/settings_graders.html @@ -5,6 +5,7 @@ <%namespace name='static' file='static_content.html'/> <%! + import json from contentstore import utils from django.utils.translation import ugettext as _ %> @@ -22,7 +23,7 @@ <%block name="requirejs"> require(["js/factories/settings_graders"], function(SettingsGradersFactory) { - SettingsGradersFactory(${course_details|n}, "${grading_url}"); + SettingsGradersFactory(_.extend(${course_details|n}, {is_credit_course: ${json.dumps(is_credit_course)}}), "${grading_url}"); });