Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle

This commit is contained in:
Sam Hemelryk 2013-12-17 08:45:05 +13:00
commit 2b08f90aca

View file

@ -451,8 +451,8 @@ class assign {
// Save changes button. // Save changes button.
$action = 'grade'; $action = 'grade';
if ($this->process_save_grade($mform)) { if ($this->process_save_grade($mform)) {
$message = get_string('gradingchangessaved', 'assign'); $action = 'redirect';
$action = 'savegradingresult'; $nextpageparams['action'] = 'savegradingresult';
} }
} else { } else {
// Cancel button. // Cancel button.
@ -488,6 +488,7 @@ class assign {
redirect($nextpageurl); redirect($nextpageurl);
return; return;
} else if ($action == 'savegradingresult') { } else if ($action == 'savegradingresult') {
$message = get_string('gradingchangessaved', 'assign');
$o .= $this->view_savegrading_result($message); $o .= $this->view_savegrading_result($message);
} else if ($action == 'quickgradingresult') { } else if ($action == 'quickgradingresult') {
$mform = null; $mform = null;