L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-75714_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2022-09-15 09:26:13 +08:00
parent fb049600c3 6e672c0a82
commit 24a00a0d97
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/format/singleactivity/tests/behat/activity_navigation.feature
+11
View File
@@ -9,6 +9,7 @@ Feature: Activity navigation in a single activity course
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student1 | Student | 1 | student1@example.com |
| student2 | Student | 2 | student2@example.com |
And the following "courses" exist:
| fullname | shortname | format | activitytype |
| Course 1 | C1 | singleactivity | forum |
@@ -65,3 +66,13 @@ Feature: Activity navigation in a single activity course
Then "#prev-activity-link" "css_element" should not exist
And "#next-activity-link" "css_element" should not exist
And "Jump to..." "field" should not exist
Scenario: The activity navigation asks for login to guest user
Given I log in as "guest"
When I am on "Course 1" course homepage
Then I should see "Guests cannot access this course. Please log in"
Scenario: The activity navigation asks for login to not enrolled user
Given I log in as "student2"
When I am on "Course 1" course homepage
Then I should see "You cannot enrol yourself in this course"
lib/classes/navigation/views/secondary.php
+4 -1
View File
@@ -1027,7 +1027,10 @@ class secondary extends view {
$coursesecondarynode = navigation_node::create(get_string('course'), null, self::TYPE_COURSE, null, 'course');
$this->load_course_navigation($coursesecondarynode);
// Remove the unnecessary 'Course' child node generated in load_course_navigation().
$coursesecondarynode->find('coursehome', self::TYPE_COURSE)->remove();
$coursehomenode = $coursesecondarynode->find('coursehome', self::TYPE_COURSE);
if (!empty($coursehomenode)) {
$coursehomenode->remove();
}
// Add the 'Course' node to the secondary navigation only if this node has children nodes.
if (count($coursesecondarynode->children) > 0) {