Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-56221' of https://github.com/bostelm/moodle
  • Loading branch information
andrewnicols committed Nov 17, 2016
2 parents c35ef2e + 9574320 commit 3d15dfc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion mod/assign/amd/build/grading_panel.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mod/assign/amd/src/grading_panel.js
Expand Up @@ -89,7 +89,7 @@ define(['jquery', 'core/yui', 'core/notification', 'core/templates', 'core/fragm
}

// Copy data from notify students checkbox which was moved out of the form.
var checked = $('[data-region="grading-actions-form"] [name="sendstudentnotifications"]').val();
var checked = $('[data-region="grading-actions-form"] [name="sendstudentnotifications"]').prop("checked");
$('.gradeform [name="sendstudentnotifications"]').val(checked);
};

Expand Down
2 changes: 1 addition & 1 deletion mod/assign/locallib.php
Expand Up @@ -6260,7 +6260,7 @@ protected function process_save_quick_grades() {
if ($current->grade !== null) {
$current->grade = floatval($current->grade);
}
$gradechanged = $gradecolpresent && $current->grade !== $modified->grade;
$gradechanged = $gradecolpresent && grade_floats_different($current->grade, $modified->grade);
$markingallocationchanged = $this->get_instance()->markingworkflow &&
$this->get_instance()->markingallocation &&
($modified->allocatedmarker !== false) &&
Expand Down

0 comments on commit 3d15dfc

Please sign in to comment.