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

MDL-75897 output: safer checking of course reuse action nodes.

Browse Source 
Also ensure that if course reuse contains only a single node (e.g.
reset), then it is still accessible from secondary navigation.

Co-authored-by: Meirza Arson <[email protected]>
This commit is contained in:
Paul Holden
2022-10-20 11:08:22 +01:00
co-authored by Meirza Arson
parent f8d28e4ca6
commit d53b5879ca
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/navigation/views/secondary.php
+14 -13
View File
@@ -299,17 +299,15 @@ class secondary extends view {
* @return navigation_node The node intact with an action to use.
*/
protected function get_first_action_for_node(navigation_node $node): ?navigation_node {
// If the node does not have children OR has an action no further processing needed.
// If the node does not have children and has no action then no further processing is needed.
$newnode = null;
if ($node->has_children()) {
if (!$node->has_action()) {
// We want to find the first child with an action.
// We want to check all children on this level before going further down.
// Note that new node gets changed here.
$newnode = $this->get_node_with_first_action($node, $node);
} else {
$newnode = $node;
}
if ($node->has_children() && !$node->has_action()) {
// We want to find the first child with an action.
// We want to check all children on this level before going further down.
// Note that new node gets changed here.
$newnode = $this->get_node_with_first_action($node, $node);
} else if ($node->has_action()) {
$newnode = $node;
}
return $newnode;
}
@@ -426,9 +424,12 @@ class secondary extends view {
$overflownode = $this->get_course_overflow_nodes($rootnode);
if (!is_null($overflownode)) {
$actionnode = $this->get_first_action_for_node($overflownode);
// All additional nodes will be available under the 'Course reuse' page.
$text = get_string('coursereuse');
$rootnode->add($text, $actionnode->action, navigation_node::TYPE_COURSE, null, 'coursereuse', new \pix_icon('t/edit', $text));
if ($actionnode) {
// All additional nodes will be available under the 'Course reuse' page.
$text = get_string('coursereuse');
$rootnode->add($text, $actionnode->action, navigation_node::TYPE_COURSE, null, 'coursereuse',
new \pix_icon('t/edit', $text));
}
}
// Add the respective first node, provided there are other nodes included.