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

Merge branch 'MDL-87571-main' of https://github.com/aanabit/moodle

Browse Source
This commit is contained in:
Sara Arjona
2026-03-06 09:11:11 +07:00
committed by Huong Nguyen
parent 5d2bb3d3c0 6bcea23124
commit eeab920279
2 changed files with 134 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/course/classes/route/controller/course_navigation.php
+5 -1
View File
@@ -129,7 +129,7 @@ class course_navigation {
return $this->redirect($response, $prevcm->get_url());
}
}
return $this->page_not_found($request, $response);
return $this->redirect_to_course($response, $cm->get_course()->id);
}
/**
@@ -203,6 +203,10 @@ class course_navigation {
string $direction = 'next',
): ?ResponseInterface {
if ($direction === 'previous') {
if ($currentsection->sectionnum == 0) {
// Going to previous on the first section.
return $this->redirect_to_course($response, $modinfo->get_course()->id);
}
$section = $modinfo->get_section_info($currentsection->sectionnum);
} else {
$section = $modinfo->get_section_info($currentsection->sectionnum + 1);
public/course/tests/route/controller/course_navigation_test.php
+129 -68
View File
@@ -525,6 +525,41 @@ final class course_navigation_test extends route_testcase {
['section' => 2, 'available' => $emailavailability . '[email protected]"}],"showc":[false]}'],
],
];
yield 'With module not supporting FEATURE_CAN_DISPLAY (student)' => [
'cmsdef' => [
['name' => 'cm1'],
['name' => 'cm2', 'type' => 'qbank'],
['name' => 'cm3'],
],
'current' => 'cm1',
'expected' => [
'id' => 'cm3', // The cm2 should be skipped as it does not support FEATURE_CAN_DISPLAY.
],
];
yield 'With module not supporting FEATURE_CAN_DISPLAY (teacher)' => [
'cmsdef' => [
['name' => 'cm1'],
['name' => 'cm2', 'type' => 'qbank'],
['name' => 'cm3'],
],
'current' => 'cm1',
'expected' => [
'id' => 'cm3', // The cm2 should be skipped as it does not support FEATURE_CAN_DISPLAY.
],
'role' => 'teacher',
];
yield 'With module not supporting FEATURE_CAN_DISPLAY (editingteacher)' => [
'cmsdef' => [
['name' => 'cm1'],
['name' => 'cm2', 'type' => 'qbank'],
['name' => 'cm3'],
],
'current' => 'cm1',
'expected' => [
'id' => 'cm3', // The cm2 should be skipped as it does not support FEATURE_CAN_DISPLAY.
],
'role' => 'editingteacher',
];
yield 'Last activity of a section (student)' => [
'cmsdef' => [
['name' => 'cm1'],
@@ -566,41 +601,6 @@ final class course_navigation_test extends route_testcase {
'statuscode' => 404,
],
];
yield 'With module not supporting FEATURE_CAN_DISPLAY (student)' => [
'cmsdef' => [
['name' => 'cm1'],
['name' => 'cm2', 'type' => 'qbank'],
['name' => 'cm3'],
],
'current' => 'cm1',
'expected' => [
'id' => 'cm3', // The cm2 should be skipped as it does not support FEATURE_CAN_DISPLAY.
],
];
yield 'With module not supporting FEATURE_CAN_DISPLAY (teacher)' => [
'cmsdef' => [
['name' => 'cm1'],
['name' => 'cm2', 'type' => 'qbank'],
['name' => 'cm3'],
],
'current' => 'cm1',
'expected' => [
'id' => 'cm3', // The cm2 should be skipped as it does not support FEATURE_CAN_DISPLAY.
],
'role' => 'teacher',
];
yield 'With module not supporting FEATURE_CAN_DISPLAY (editingteacher)' => [
'cmsdef' => [
['name' => 'cm1'],
['name' => 'cm2', 'type' => 'qbank'],
['name' => 'cm3'],
],
'current' => 'cm1',
'expected' => [
'id' => 'cm3', // The cm2 should be skipped as it does not support FEATURE_CAN_DISPLAY.
],
'role' => 'editingteacher',
];
}
/**
@@ -704,6 +704,48 @@ final class course_navigation_test extends route_testcase {
'id' => 'cm1', // Students cannot see stealth modules in the course page.
],
];
yield 'Hidden first module (teacher)' => [
'cmsdef' => [
['name' => 'cm1', 'options' => ['visible' => false]],
['name' => 'cm2'],
],
'current' => 'cm2',
'expected' => [
'id' => 'cm1', // Students cannot see stealth modules in the course page.
],
'role' => 'teacher',
];
yield 'Hidden first module (student)' => [
'cmsdef' => [
['name' => 'cm1', 'options' => ['visible' => false]],
['name' => 'cm2'],
],
'current' => 'cm2',
'expected' => [
'type' => 'course', // Students cannot see hidden modules.
],
];
yield 'Stealth first module (teacher)' => [
'cmsdef' => [
['name' => 'cm1', 'options' => ['visibleoncoursepage' => false]],
['name' => 'cm2'],
],
'current' => 'cm2',
'expected' => [
'id' => 'cm1', // Students cannot see stealth modules in the course page.
],
'role' => 'teacher',
];
yield 'Stealth first module (student)' => [
'cmsdef' => [
['name' => 'cm1', 'options' => ['visibleoncoursepage' => false]],
['name' => 'cm2'],
],
'current' => 'cm2',
'expected' => [
'type' => 'course', // Students cannot see stealth modules in the course page.
],
];
yield 'Restricted module visible (editingteacher)' => [
'cmsdef' => [
['name' => 'cm1'],
@@ -787,6 +829,16 @@ final class course_navigation_test extends route_testcase {
'id' => 'cm1',
],
];
yield 'Subsection: With previous module being a subsection in the first section (student)' => [
'cmsdef' => [
['name' => 'subsection1', 'type' => 'subsection', 'options' => ['section' => 0]],
['name' => 'cm1', 'options' => ['section' => 'subsection1']],
],
'current' => 'cm1',
'expected' => [
'type' => 'course',
],
];
yield 'Subsection: With previous module outside a subsection (student)' => [
'cmsdef' => [
['name' => 'cm1', 'options' => ['section' => 2]],
@@ -1034,39 +1086,6 @@ final class course_navigation_test extends route_testcase {
['section' => 2, 'available' => $emailavailability . '[email protected]"}],"showc":[false]}'],
],
];
yield 'First activity of a course (student)' => [
'cmsdef' => [
['name' => 'cm1'],
['name' => 'cm2'],
],
'current' => 'cm1',
'expected' => [
'type' => 'section',
'id' => '0',
],
];
yield 'With first module without url (student)' => [
'cmsdef' => [
['name' => 'cm1', 'type' => 'label'],
['name' => 'cm2', 'options' => ['section' => 2]],
],
'current' => 'cm2',
'expected' => [
'type' => 'section',
'id' => '2',
],
];
yield 'With module that does not exist (student)' => [
'cmsdef' => [
['name' => 'cm1'],
['name' => 'cm2'],
],
'current' => 'cmthatdoesnotexist',
'expected' => [
'type' => 'error',
'statuscode' => 404,
],
];
yield 'With module not supporting FEATURE_CAN_DISPLAY (student)' => [
'cmsdef' => [
['name' => 'cm1'],
@@ -1102,6 +1121,48 @@ final class course_navigation_test extends route_testcase {
],
'role' => 'editingteacher',
];
yield 'First activity of a course (student)' => [
'cmsdef' => [
['name' => 'cm1'],
['name' => 'cm2'],
],
'current' => 'cm1',
'expected' => [
'type' => 'course',
],
];
yield 'With first module without url in the first section (student)' => [
'cmsdef' => [
['name' => 'cm1', 'type' => 'label'],
['name' => 'cm2', 'options' => ['section' => 0]],
],
'current' => 'cm2',
'expected' => [
'type' => 'course',
],
];
yield 'With first module without url (student)' => [
'cmsdef' => [
['name' => 'cm1', 'type' => 'label'],
['name' => 'cm2', 'options' => ['section' => 2]],
],
'current' => 'cm2',
'expected' => [
'type' => 'section',
'id' => '2',
],
];
yield 'With module that does not exist (student)' => [
'cmsdef' => [
['name' => 'cm1'],
['name' => 'cm2'],
],
'current' => 'cmthatdoesnotexist',
'expected' => [
'type' => 'error',
'statuscode' => 404,
],
];
}
/**