mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 06:18:28 +01:00
MDL-27920 gradebook: fixes following integration review
This commit is contained in:
parent
7ce5df8620
commit
8de7c8a7ff
@ -58,8 +58,7 @@ if ($data = $mform->get_data()) {
|
|||||||
$export->process_form($data);
|
$export->process_form($data);
|
||||||
$export->print_continue();
|
$export->print_continue();
|
||||||
|
|
||||||
$require_user_idnumber = true; //skip users without idnumber as they cannot be identified when importing
|
$export->display_preview(true); //true == skip users without idnumber as they cannot be identified when importing
|
||||||
$export->display_preview($require_user_idnumber);
|
|
||||||
echo $OUTPUT->container(get_string('useridnumberwarning','gradeexport_xml'), 'useridnumberwarning mdl-align');
|
echo $OUTPUT->container(get_string('useridnumberwarning','gradeexport_xml'), 'useridnumberwarning mdl-align');
|
||||||
|
|
||||||
echo $OUTPUT->footer();
|
echo $OUTPUT->footer();
|
||||||
|
@ -275,7 +275,7 @@ class graded_users_iterator {
|
|||||||
function _pop() {
|
function _pop() {
|
||||||
global $DB;
|
global $DB;
|
||||||
if (empty($this->gradestack)) {
|
if (empty($this->gradestack)) {
|
||||||
if (!$this->grades_rs) {
|
if (empty($this->grades_rs) || !$this->grades_rs->valid()) {
|
||||||
return null; // no grades present
|
return null; // no grades present
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user