moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-46902 core_course: display meaningful message when no courses found

Browse source
This commit is contained in:
Mark Nelson 2014-08-19 21:38:55 -07:00
parent 1446e02f69
commit 09fef88c64
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
course/classes/management_renderer.php
View file

@ -1050,9 +1050,11 @@ class core_course_management_renderer extends plugin_renderer_base {
* @param course_in_list $course The currently selected course if there is one. * @param course_in_list $course The currently selected course if there is one.
* @param int $page The current page, starting at 0. * @param int $page The current page, starting at 0.
* @param int $perpage The number of courses to display per page. * @param int $perpage The number of courses to display per page.
* @param string $search The string we are searching for.
* @return string * @return string
*/ */
public function search_listing(array $courses, $totalcourses, course_in_list $course = null, $page = 0, $perpage = 20) { public function search_listing(array $courses, $totalcourses, course_in_list $course = null, $page = 0, $perpage = 20,
$search = '') {
$page = max($page, 0); $page = max($page, 0);
$perpage = max($perpage, 2); $perpage = max($perpage, 2);
$totalpages = ceil($totalcourses / $perpage); $totalpages = ceil($totalcourses / $perpage);
@ -1082,7 +1084,7 @@ class core_course_management_renderer extends plugin_renderer_base {
$first = false; $first = false;
} }
$html .= html_writer::end_tag('ul'); $html .= html_writer::end_tag('ul');
$html .= $this->search_pagination($totalcourses, $page, $perpage, true); $html .= $this->search_pagination($totalcourses, $page, $perpage, true, $search);
$html .= html_writer::end_div(); $html .= html_writer::end_div();
return $html; return $html;
} }
@ -1094,13 +1096,16 @@ class core_course_management_renderer extends plugin_renderer_base {
* @param int $page The current page. * @param int $page The current page.
* @param int $perpage The number of courses being displayed. * @param int $perpage The number of courses being displayed.
* @param bool $showtotals Whether or not to print total information. * @param bool $showtotals Whether or not to print total information.
* @param string $search The string we are searching for.
* @return string * @return string
*/ */
protected function search_pagination($totalcourses, $page, $perpage, $showtotals = false) { protected function search_pagination($totalcourses, $page, $perpage, $showtotals = false, $search = '') {
$html = ''; $html = '';
$totalpages = ceil($totalcourses / $perpage); $totalpages = ceil($totalcourses / $perpage);
if ($showtotals) { if ($showtotals) {
if ($totalpages == 1) { if ($totalpages == 0) {
$str = get_string('nocoursesfound', 'moodle', $search);
} else if ($totalpages == 1) {
$str = get_string('showingacourses', 'moodle', $totalcourses); $str = get_string('showingacourses', 'moodle', $totalcourses);
} else { } else {
$a = new stdClass; $a = new stdClass;

2
course/management.php
View file

@ -499,7 +499,7 @@ if ($displaycourselisting) {
} else { } else {
list($courses, $coursescount, $coursestotal) = list($courses, $coursescount, $coursestotal) =
\core_course\management\helper::search_courses($search, $blocklist, $modulelist, $page, $perpage); \core_course\management\helper::search_courses($search, $blocklist, $modulelist, $page, $perpage);
echo $renderer->search_listing($courses, $coursestotal, $course, $page, $perpage); echo $renderer->search_listing($courses, $coursestotal, $course, $page, $perpage, $search);
} }
echo $renderer->grid_column_end(); echo $renderer->grid_column_end();
if ($displaycoursedetail) { if ($displaycoursedetail) {