Permalink
Browse files

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

…dle into MOODLE_23_STABLE
  • Loading branch information...
2 parents d7b3cce + 9d40987 commit 09ebf8386a6238d7b36a0741556f56125768a469 @stronk7 stronk7 committed Jan 15, 2013
Showing with 11 additions and 9 deletions.
  1. +6 −8 course/index.php
  2. +5 −1 course/lib.php
View
14 course/index.php
@@ -67,12 +67,11 @@
$strfulllistofcourses = get_string('fulllistofcourses');
-/// Unless it's an editing admin, just print the regular listing of courses/categories
+// Unless it's an editing admin, just print the regular listing of courses/categories.
if (!$adminediting) {
-
-/// Print form for creating new categories
+ $showaddcoursebutton = true;
+ // Print form for creating new categories.
$countcategories = $DB->count_records('course_categories');
-
if ($countcategories > 1 || ($countcategories == 1 && $DB->count_records('course') > 200)) {
$strcourses = get_string('courses');
$strcategories = get_string('categories');
@@ -96,14 +95,13 @@
echo $OUTPUT->header();
echo $OUTPUT->skip_link_target();
echo $OUTPUT->box_start('courseboxes');
- print_courses(0);
+ $showaddcoursebutton = print_courses(0);
echo $OUTPUT->box_end();
}
echo $OUTPUT->container_start('buttons');
- if (has_capability('moodle/course:create', $systemcontext)) {
- /// Print link to create a new course
- /// Get the 1st available category
+ if (has_capability('moodle/course:create', $systemcontext) && $showaddcoursebutton) {
+ // Print link to create a new course, for the 1st available category.
$options = array('category' => $CFG->defaultrequestcategory);
echo $OUTPUT->single_button(new moodle_url('edit.php', $options), get_string('addnewcourse'), 'get');
}
View
6 course/lib.php
@@ -2457,7 +2457,9 @@ function update_category_button($categoryid = 0) {
}
/**
- * Category is 0 (for all courses) or an object
+ * Print courses in category. If category is 0 then all courses are printed.
+ * @param int|stdClass $category category object or id.
+ * @return bool true if courses found and printed, else false.
*/
function print_courses($category) {
global $CFG, $OUTPUT;
@@ -2505,8 +2507,10 @@ function print_courses($category) {
echo html_writer::start_tag('div', array('class'=>'addcoursebutton'));
echo $OUTPUT->single_button(new moodle_url('/course/edit.php', $options), get_string("addnewcourse"));
echo html_writer::end_tag('div');
+ return false;
}
}
+ return true;
}
/**

0 comments on commit 09ebf83

Please sign in to comment.