From 678e8898aa6ea4e8419d1bf440db6c8172768940 Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Mon, 17 Sep 2007 17:39:35 +0000 Subject: [PATCH] MDL-11282 Just displaying a simple notice, and continuing with the regrading. --- lang/en_utf8/grades.php | 2 +- lib/gradelib.php | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lang/en_utf8/grades.php b/lang/en_utf8/grades.php index 9c9242e76..dcc712846 100644 --- a/lang/en_utf8/grades.php +++ b/lang/en_utf8/grades.php @@ -163,7 +163,7 @@ $string['gradeexceptions'] = 'Grade Exceptions'; $string['gradeexceptionshelp'] = 'Grade Exceptions Help'; $string['gradehelp'] = 'Grade Help'; $string['gradeitem'] = 'Grade item'; -$string['gradeitemislocked'] = 'This activity is locked in the gradebook. If you regrade it, the grades held internally by this activity will be different from the ones in the gradebook, the latter which will remain unchanged. Are you sure you want to proceed with the regrading?'; +$string['gradeitemislocked'] = 'This activity is locked in the gradebook. Changes that are made to grades in this activity will not be copied to the gradebook until it is unlocked.'; $string['gradeitemlocked'] = 'Grading locked'; $string['gradeitemsinc'] = 'Grade items to be included'; $string['gradeitemaddusers'] = 'Exclude from Grading'; diff --git a/lib/gradelib.php b/lib/gradelib.php index 16ac00de7..ac43d3cd3 100644 --- a/lib/gradelib.php +++ b/lib/gradelib.php @@ -128,14 +128,9 @@ function grade_update($source, $courseid, $itemtype, $itemmodule, $iteminstance, } else { if ($grade_item->is_locked()) { - $confirm_regrade = optional_param('confirm_regrade', 0, PARAM_INT); - if (!$confirm_regrade) { - $message = get_string('gradeitemislocked', 'grades', $grade_item->itemname); - $back_link = ''; - $regrade_link = qualified_me() . '&confirm_regrade=1'; - notice_yesno($message, $regrade_link, $back_link); - return GRADE_UPDATE_ITEM_LOCKED; - } + $message = get_string('gradeitemislocked', 'grades', $grade_item->itemname); + notice($message); + return GRADE_UPDATE_ITEM_LOCKED; } if ($itemdetails) { -- 2.11.4.GIT