Merge branch 'MDL-74254-master' of https://github.com/marinaglancy/mo…

…odle
moodle · Mar 21, 2022 · 8c68977 · 8c68977
2 parents 375cdaa + 09446a2
commit 8c68977
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/blocks/myoverview/classes/output/main.php b/blocks/myoverview/classes/output/main.php
@@ -412,7 +412,7 @@ public function export_for_template(renderer_base $output) {
 
         $newcourseurl = '';
         $coursecat = \core_course_category::user_top();
-        if ($category = \core_course_category::get_nearest_editable_subcategory($coursecat, ['create'])) {
+        if ($coursecat && ($category = \core_course_category::get_nearest_editable_subcategory($coursecat, ['create']))) {
             $newcourseurl = new \moodle_url('/course/edit.php', ['category' => $category->id]);
         }
 

diff --git a/my/courses.php b/my/courses.php
@@ -64,11 +64,11 @@
 // Add course management if the user has the capabilities for it.
 $coursecat = core_course_category::user_top();
 $coursemanagemenu = [];
-if ($category = core_course_category::get_nearest_editable_subcategory($coursecat, ['create'])) {
+if ($coursecat && ($category = core_course_category::get_nearest_editable_subcategory($coursecat, ['create']))) {
     // The user has the capability to create course.
     $coursemanagemenu['newcourseurl'] = new moodle_url('/course/edit.php', ['category' => $category->id]);
 }
-if ($category = core_course_category::get_nearest_editable_subcategory($coursecat, ['manage'])) {
+if ($coursecat && ($category = core_course_category::get_nearest_editable_subcategory($coursecat, ['manage']))) {
     // The user has the capability to manage the course category.
     $coursemanagemenu['manageurl'] = new moodle_url('/course/management.php', ['categoryid' => $category->id]);
 }

diff --git a/my/tests/behat/my_courses.feature b/my/tests/behat/my_courses.feature
@@ -30,6 +30,13 @@ Feature: Run tests over my courses.
     Given I am on the "My courses" page logged in as "user1"
     Then "Course management options" "link" should not exist
 
+  Scenario: User without capability to browse courses cannot see any link
+    Given the following "permission overrides" exist:
+      | capability                     | permission | role | contextlevel | reference |
+      | moodle/category:viewcourselist | Prevent    | user | System       |           |
+    Given I am on the "My courses" page logged in as "user1"
+    Then "Course management options" "link" should not exist
+
   @javascript
   Scenario: User with creating a course permission can see the Create course link only
     Given the following "permission overrides" exist: