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

Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle

Browse Source 
Conflicts:
	mod/quiz/lib.php
	mod/quiz/mod_form.php
	mod/quiz/tests/behat/completion_condition_passing_grade.feature
This commit is contained in:
Sam Hemelryk
2014-07-17 15:16:07 +12:00
parent 68b1e63080 349c930343
commit e6330e5ba8
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/quiz/lib.php
+3 -1
View File
@@ -1835,7 +1835,9 @@ function quiz_get_completion_state($course, $cm, $userid, $type) {
'itemmodule' => 'quiz', 'iteminstance' => $cm->instance));
if ($item) {
$grades = grade_grade::fetch_users_grades($item, array($userid), false);
return $grades[$userid]->is_passed($item);
if (!empty($grades[$userid])) {
return $grades[$userid]->is_passed($item);
}
}
}
return false;
mod/quiz/mod_form.php
+1 -1
View File
@@ -603,7 +603,7 @@ class mod_quiz_mod_form extends moodleform_mod {
get_string('completionattemptsexhausted', 'quiz'),
array('group' => 'cattempts'));
$mform->disabledIf('completionattemptsexhausted', 'completionpass', 'notchecked');
$mform->addGroup($group, 'completionpassgroup', get_string('completionpass', 'quiz'), '', false);
$mform->addGroup($group, 'completionpassgroup', get_string('completionpass', 'quiz'), '   ', false);
$mform->addHelpButton('completionpassgroup', 'completionpass', 'quiz');
$items[] = 'completionpassgroup';
return $items;