Remove hardcoded admin paths from report URLs

Author: Flamenco

classes/ReportUtil.php

@@ -131,10 +131,20 @@ function render(&$tree, $level, &$s)
         return "<div class='report-tree'>" . $s . "</div>";
     }
 
+    public static function getAdminBaseRelative()
+    {
+        $config = \Grav\Common\Grav::instance()['config'];
+        $route = $config->get('plugins.admin.route');
+        $base = '/' . trim($route, '/');
+        return $config->grav['base_url_relative'] . $base;
+//        $admin_base = '/' . trim($config->get('plugins.admin.route'), '/');
+//        $admin_base = trim($config->get('plugins.admin.route'), '/');
+//        return $admin_base;
+    }
+
     public static function edit_link($page, $text)
     {
-        $base = \Grav\Common\Grav::instance()['base_url_relative'];
-        $href = $base . "/admin/pages" . $page->route();
+        $href = self::getAdminBaseRelative() . "/pages" . $page->route();
         return "<a href='$href'>" . $text . "</a>";
     }
 
@@ -155,7 +165,7 @@ public static function view_url($page)
     public static function edit_url($page)
     {
         $base = \Grav\Common\Grav::instance()['base_url_relative'];
-        $href = $base . "/admin/pages" . $page->route();
+        $href = self:: getAdminBaseRelative() . "/pages" . $page->route();
         return $href;
     }
 
@@ -211,7 +221,7 @@ public static function getUnusedMedia()
                     $unused[$path] = $html;
 //                    $unused[$path] = [
 //                        "page" => ,
-//                        "preview" => 
+//                        "preview" =>
 //                    ];
                 }
             }
@@ -306,4 +316,4 @@ public static function isCachedPath($page)
     {
         return preg_match(self::rxCached, $page);
     }
-}
+}

services/reports.php

@@ -72,8 +72,8 @@ function array_find($filter, $array)
             }
         ]);
 
-        $url = \Grav\Common\Grav::instance()['base_url_relative'];
-        $url .= "/admin/admin-power-tools/reports";
+        $url = ReportUtil::getAdminBaseRelative();
+        $url .= "/admin-power-tools/reports";
         $manager->registerService('action', [
             "caption" => "Reports",
             "icon" => "fa-list",