L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:

	mod/assign/locallib.php
This commit is contained in:
Damyon Wiese
2013-07-29 10:00:10 +08:00
parent 214dd19aa2
commit 336f2df35d
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/assign/locallib.php
+15 -2
View File
@@ -3303,7 +3303,15 @@ class assign {
}
}
if ($this->grading_disabled($userid)) {
// 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;
}
@@ -4073,7 +4081,11 @@ class assign {
/**
<<<<<<< HEAD
* Determine if this users grade is locked or overridden
=======
* Determine if this users grade can be edited.
>>>>>>> fafad00... MDL-34989 assign: Do not add a param to grading_disabled - cannot be backported.
*
* @param int $userid - The student userid
* @return bool $gradingdisabled
@@ -4170,10 +4182,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');