Permalink
Browse files

Merge branch 'MDL-30821-m21' of git://github.com/ankitagarwal/moodle …

…into MOODLE_21_STABLE
  • Loading branch information...
Sam Hemelryk
Sam Hemelryk committed Feb 14, 2012
2 parents d5e19eb + 45462d2 commit 98899b998ca20d29c754309c980f0a5484b9d3a2
Showing with 11 additions and 5 deletions.
  1. +11 −5 mod/scorm/report.php
View
@@ -528,12 +528,18 @@
echo '</tr></table>';
}
}
- if (!$download) {
- $mform->set_data($displayoptions + compact('detailedrep', 'pagesize'));
- $mform->display();
- }
} else {
- echo $OUTPUT->notification(get_string('noactivity', 'scorm'));
+ if ($candelete && !$download) {
+ echo '</div>';
+ echo '</form>';
+ $table->finish_output();
+ }
+ echo '</div>';
+ }
+ // Show preferences form irrespective of whether there are attempts to report or not
+ if (!$download) {
+ $mform->set_data($displayoptions + compact('detailedrep', 'pagesize', 'attemptsmode'));
+ $mform->display();
}
if ($download == 'Excel' or $download == 'ODS') {
$workbook->close();

0 comments on commit 98899b9

Please sign in to comment.