From 92ce50e2d29c6d02bb64c0c41a4c4fdf7d319a73 Mon Sep 17 00:00:00 2001
From: chris <chris@ph4te.net>
Date: Thu, 27 Aug 2020 13:53:48 -0400
Subject: [PATCH] use full path for active menu detection

---
 .../static/baseTemplate/assets/finalJS/final.js        | 10 ++++++----
 static/baseTemplate/assets/finalJS/final.js            | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/baseTemplate/static/baseTemplate/assets/finalJS/final.js b/baseTemplate/static/baseTemplate/assets/finalJS/final.js
index ca343efad..75d65aa4e 100755
--- a/baseTemplate/static/baseTemplate/assets/finalJS/final.js
+++ b/baseTemplate/static/baseTemplate/assets/finalJS/final.js
@@ -883,11 +883,13 @@ $(document).ready(function() {
         });
 
         //automatically open the current path
-        var path = window.location.pathname.split('/');
-        path = path[path.length-1];
+        let path = window.location.pathname;
         if (path !== undefined) {
-            $("#sidebar-menu").find("a[href$='" + path + "']").addClass('sfActive');
-            $("#sidebar-menu").find("a[href$='" + path + "']").parents().eq(3).superclick('show');
+            let menuItem = $("#sidebar-menu").find("a[href$='" + path + "']");
+            if (menuItem !== undefined) {
+                menuItem.addClass('sfActive');
+                menuItem.parents().eq(3).superclick('show');
+            }
         }
 
     });
diff --git a/static/baseTemplate/assets/finalJS/final.js b/static/baseTemplate/assets/finalJS/final.js
index ca343efad..75d65aa4e 100755
--- a/static/baseTemplate/assets/finalJS/final.js
+++ b/static/baseTemplate/assets/finalJS/final.js
@@ -883,11 +883,13 @@ $(document).ready(function() {
         });
 
         //automatically open the current path
-        var path = window.location.pathname.split('/');
-        path = path[path.length-1];
+        let path = window.location.pathname;
         if (path !== undefined) {
-            $("#sidebar-menu").find("a[href$='" + path + "']").addClass('sfActive');
-            $("#sidebar-menu").find("a[href$='" + path + "']").parents().eq(3).superclick('show');
+            let menuItem = $("#sidebar-menu").find("a[href$='" + path + "']");
+            if (menuItem !== undefined) {
+                menuItem.addClass('sfActive');
+                menuItem.parents().eq(3).superclick('show');
+            }
         }
 
     });