Skip to content
Permalink
Browse files

Merge branch 'MDL-54745_master' of https://github.com/snake/moodle

  • Loading branch information...
stronk7 committed Aug 2, 2016
2 parents babfc98 + 0cced3c commit 5fe1db394b0594a64350af8228a436147afe4a09
Showing with 4 additions and 13 deletions.
  1. +3 −1 mod/assign/lang/en/assign.php
  2. +1 −0 mod/assign/lang/en/deprecated.txt
  3. +0 −12 mod/assign/module.js
@@ -104,7 +104,6 @@
$string['blindmarking_help'] = 'Blind marking hides the identity of students from markers. Blind marking settings will be locked once a submission or grade has been made in relation to this assignment.';
$string['changeuser'] = 'Change user';
$string['changefilters'] = 'Change filters';
$string['changegradewarning'] = 'This assignment has graded submissions and changing the grade will not automatically re-calculate existing submission grades. You must re-grade all existing submissions, if you wish to change the grade.';
$string['choosegradingaction'] = 'Grading action';
$string['choosemarker'] = 'Choose...';
$string['chooseoperation'] = 'Choose operation';
@@ -503,3 +502,6 @@
$string['viewrevealidentitiesconfirm'] = 'View reveal student identities confirmation page.';
$string['workflowfilter'] = 'Workflow filter';
$string['xofy'] = '{$a->x} of {$a->y}';
// Deprecated since Moodle 3.2.
$string['changegradewarning'] = 'This assignment has graded submissions and changing the grade will not automatically re-calculate existing submission grades. You must re-grade all existing submissions, if you wish to change the grade.';
@@ -0,0 +1 @@
changegradewarning,mod_assign
@@ -150,18 +150,6 @@ M.mod_assign.init_grading_options = function(Y) {
});
};

M.mod_assign.init_grade_change = function(Y) {
var gradenode = Y.one('#id_grade');
if (gradenode) {
var originalvalue = gradenode.get('value');
gradenode.on('change', function() {
if (gradenode.get('value') != originalvalue) {
alert(M.util.get_string('changegradewarning', 'mod_assign'));
}
});
}
};

M.mod_assign.init_plugin_summary = function(Y, subtype, type, submissionid) {
suffix = subtype + '_' + type + '_' + submissionid;
classname = 'contract_' + suffix;

0 comments on commit 5fe1db3

Please sign in to comment.
You can’t perform that action at this time.