MDL-10873 If both site default and user pref are empty for studentsperpage, we assume that paging is not wanted, so all paging functionality is switched off in the report.

This commit is contained in:
nicolasconnault 2007-08-16 18:09:49 +00:00
parent 4f8783fe91
commit 09cef06a10
2 changed files with 18 additions and 7 deletions

View File

@ -151,7 +151,11 @@ echo $report->group_selector;
echo '<div class="clearer"></div>';
echo $report->get_toggles_html();
print_paging_bar($numusers, $report->page, $report->get_pref('studentsperpage'), $report->pbarurl);
$studentsperpage = $report->get_pref('studentsperpage');
// Don't use paging if studentsperpage is empty or 0 at course AND site levels
if (!empty($studentsperpage)) {
print_paging_bar($numusers, $report->page, $studentsperpage, $report->pbarurl);
}
$reporthtml = '<table class="gradestable flexible boxaligncenter generaltable">';
$reporthtml .= $report->get_headerhtml();
@ -179,8 +183,8 @@ if ($USER->gradeediting[$course->id] && ($report->get_pref('quickfeedback') || $
}
// prints paging bar at bottom for large pages
if ($report->get_pref('studentsperpage') >= 20) {
print_paging_bar($numusers, $report->page, $report->get_pref('studentsperpage'), $report->pbarurl);
if (!empty($studentsperpage) && $studentsperpage >= 20) {
print_paging_bar($numusers, $report->page, $studentsperpage, $report->pbarurl);
}
print_footer($course);

View File

@ -94,10 +94,17 @@ class grade_report_grader extends grade_report {
$this->sortitemid = $sortitemid;
// base url for sorting by first/last name
$this->baseurl = 'index.php?id='.$this->courseid.'&amp;perpage='.$this->get_pref('studentsperpage')
.'&amp;page='.$this->page.'&amp;';
//
$this->pbarurl = 'index.php?id='.$this->courseid.'&amp;perpage='.$this->get_pref('studentsperpage').'&amp;';
$studentsperpage = $this->get_pref('studentsperpage');
$perpage = '';
$curpage = '';
if (!empty($studentsperpage)) {
$perpage = '&amp;perpage='.$studentsperpage;
$curpage = '&amp;page='.$this->page;
}
$this->baseurl = 'index.php?id='.$this->courseid. $perpage.$curpage.'&amp;';
$this->pbarurl = 'index.php?id='.$this->courseid.$perpage.'&amp;';
// Setup groups if requested
if ($this->get_pref('showgroups')) {