Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'wip-mdl-30388-m22' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_22_STABLE
  • Loading branch information...
commit 646704c8d074e912a74fb4e9533a9000be6e0282 2 parents 9e6edb0 + 1ff9608
@samhemelryk samhemelryk authored
Showing with 23 additions and 4 deletions.
  1. +23 −4 course/search.php
View
27 course/search.php
@@ -42,6 +42,7 @@
}
$PAGE->set_url('/course/search.php', $urlparams);
$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
+ $PAGE->set_pagelayout('standard');
if ($CFG->forcelogin) {
require_login();
@@ -73,7 +74,8 @@
}
}
- if (has_capability('moodle/course:create', get_context_instance(CONTEXT_SYSTEM)) && $perpage != 99999) {
+ $capabilities = array('moodle/course:create', 'moodle/category:manage');
+ if (has_any_capability($capabilities, get_context_instance(CONTEXT_SYSTEM)) && ($perpage != 99999)) {
$perpage = 30;
}
@@ -137,10 +139,15 @@
JOIN {block_instances} bi ON bi.parentcontextid = ctx.id
WHERE ctx.contextlevel = " . CONTEXT_COURSE . " AND bi.blockname = ?)",
array($blockname));
+ $totalcount = count($courses);
+ //Keep only chunk of array which you want to display
+ if ($totalcount > $perpage) {
+ $courses = array_chunk($courses, $perpage, true);
+ $courses = $courses[$page];
+ }
foreach ($courses as $course) {
$courses[$course->id] = $course;
}
- $totalcount = count($courses);
}
// get list of courses containing modules if required
elseif (!empty($modulelist) and confirm_sesskey()) {
@@ -180,7 +187,6 @@
if ($PAGE->user_is_editing()) {
$string = get_string("turneditingoff");
$edit = "off";
- $perpage = 30;
} else {
$string = get_string("turneditingon");
$edit = "on";
@@ -212,10 +218,12 @@
echo $OUTPUT->heading("$strsearchresults: $totalcount");
$encodedsearch = urlencode($search);
- ///add the module parameter to the paging bar if they exists
+ // add the module/block parameter to the paging bar if they exists
$modulelink = "";
if (!empty($modulelist) and confirm_sesskey()) {
$modulelink = "&modulelist=".$modulelist."&sesskey=".sesskey();
+ } else if (!empty($blocklist) and confirm_sesskey()) {
+ $modulelink = "&blocklist=".$blocklist."&sesskey=".sesskey();
}
print_navigation_bar($totalcount, $page, $perpage, $encodedsearch, $modulelink);
@@ -370,6 +378,17 @@ function print_navigation_bar($totalcount,$page,$perpage,$encodedsearch,$modulel
echo "<center><p>";
echo "<a href=\"search.php?search=$encodedsearch".$modulelink."&amp;perpage=99999\">".get_string("showall", "", $totalcount)."</a>";
echo "</p></center>";
+ } else if ($perpage === 99999) {
+ $defultprepage = 10;
+ //If user has course:create or category:manage capability the show 30 records.
+ $capabilities = array('moodle/course:create', 'moodle/category:manage');
+ if (has_any_capability($capabilities, get_context_instance(CONTEXT_SYSTEM))) {
+ $defultprepage = 30;
+ }
+
+ echo "<center><p>";
+ echo "<a href=\"search.php?search=$encodedsearch".$modulelink."&amp;perpage=".$defultprepage."\">".get_string("showperpage", "", $defultprepage)."</a>";
+ echo "</p></center>";
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.