mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-07 09:23:31 +02:00
Code Issues Projects Releases Wiki Activity

MDL-34989 assign: Do not add a param to grading_disabled - cannot be backported.

Browse Source
This commit is contained in:
Damyon Wiese 2013-07-29 09:27:41 +08:00
parent c33b4c81bb
commit fafad009f3
1 changed files with 12 additions and 3 deletions

15
mod/assign/locallib.php

@ -4086,7 +4086,15 @@ class assign {
}
}
if ($this->grading_disabled($userid, false)) {
// See if this user grade is locked in the gradebook.
$gradinginfo = grade_get_grades($this->get_course()->id,
'mod',
'assign',
$this->get_instance()->id,
array($userid));
if ($gradinginfo &&
isset($gradinginfo->items[0]->grades[$userid]) &&
$gradinginfo->items[0]->grades[$userid]->locked) {
return false;
}
@ -5137,7 +5145,7 @@ class assign {
/**
* Determine if this users grade is locked or overridden.
* Determine if this users grade can be edited.
*
* @param int $userid - The student userid
* @param bool $checkworkflow - whether to include a check for the workflow state.
@ -5274,10 +5282,11 @@ class assign {
if (!$gradingdisabled) {
$gradingelement = $mform->addElement('text', 'grade', $name);
$mform->addHelpButton('grade', 'gradeoutofhelp', 'assign');
$mform->setType('grade', PARAM_TEXT);
$mform->setType('grade', PARAM_RAW);
} else {
$mform->addElement('hidden', 'grade', $name);
$mform->hardFreeze('grade');
$mform->setType('grade', PARAM_RAW);
$strgradelocked = get_string('gradelocked', 'assign');
$mform->addElement('static', 'gradedisabled', $name, $strgradelocked);
$mform->addHelpButton('gradedisabled', 'gradeoutofhelp', 'assign');