queue: Fix placement of nav-based edit links

include/class.queue.php

@@ -151,11 +151,8 @@ class CustomQueue extends SavedSearch {
         if (!$this->id)
             return;
 
-        $path = '';
-        if ($this->parent) {
-            $path = rtrim($this->parent->getPath(), '/');
-        }
-        return $path . "/{$this->id}/";
+        $path = $this->parent ? $this->parent->getPath() : '';
+        return $path . "/{$this->id}";
     }
 
     function getFullName() {

scp/js/scp.js

@@ -491,6 +491,24 @@ var scp_prep = function() {
       }
     }
   });
+
+  /* Custom Queues Dropdown */
+  $(function() {
+    // whenever we hover over a menu item that has a submenu
+    $('.editQ').on('mouseover', function() {
+      var $menuItem = $(this),
+          $submenuWrapper = $('.manageQ', $menuItem);
+
+      // grab the menu item's position relative to its positioned parent
+      var menuItemPos = $menuItem.position();
+
+      // place the submenu in the correct position relevant to the menu item
+      $submenuWrapper.css({
+        top: menuItemPos.top - 41,
+        left: menuItemPos.left + Math.round($menuItem.outerWidth() * 0)
+      });
+    });
+  });
 };
 
 $(document).ready(scp_prep);
@@ -1292,22 +1310,3 @@ window.relativeAdjust = setInterval(function() {
         });
     };
 })(jQuery);
-
-/*Custom Queues Dropdown*/
-
-$(function() {
-  // whenever we hover over a menu item that has a submenu
-  $('.editQ').on('mouseover', function() {
-    var $menuItem = $(this),
-        $submenuWrapper = $('.manageQ', $menuItem);
-
-    // grab the menu item's position relative to its positioned parent
-    var menuItemPos = $menuItem.position();
-
-    // place the submenu in the correct position relevant to the menu item
-    $submenuWrapper.css({
-      top: menuItemPos.top - 41,
-      left: menuItemPos.left + Math.round($menuItem.outerWidth() * 0)
-    });
-  });
-});