MDL-59599 navigation: Respect previous activity-level navigation

The original patch was overwriting grading methods navigation.

All credit goes to Andrew Nicols.

diff --git a/lib/navigationlib.php b/lib/navigationlib.php
index 3ec8ccc..4a1f7d7 100644 (file)
--- a/lib/navigationlib.php
+++ b/lib/navigationlib.php
@@ -2733,7 +2733,7 @@ class global_navigation extends navigation_node {
             $gradenode = $coursenode->add(get_string('grades'), $url, self::TYPE_SETTING, null,
                 'grades', new pix_icon('i/grades', ''));
             // If the page type matches the grade part, then make the nav drawer grade node (incl. all sub pages) active.
-            if (strpos($this->page->pagetype, 'grade-') === 0) {
+            if ($this->page->context->contextlevel < CONTEXT_MODULE && strpos($this->page->pagetype, 'grade-') === 0) {
                 $gradenode->make_active();
             }
         }