Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-02 19:36:08 +01:00
Code Issues Packages Projects Releases Activity

Fixed root showing in multiple columns

Browse Source
This commit is contained in:
Andy Miller
2019-06-06 16:38:03 -06:00
parent 9b606642be
commit ee4fd383c3
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
classes/plugin/AdminController.php
View File

@@ -1455,6 +1455,7 @@ class AdminController extends AdminBaseController
$children = null; $children = null;
$sub_route = null; $sub_route = null;
$extra = null; $extra = null;
$root = false;
// Handle leaf_route // Handle leaf_route
if ($leaf_route && $route != $leaf_route) { if ($leaf_route && $route != $leaf_route) {
@@ -1471,6 +1472,7 @@ class AdminController extends AdminBaseController
if (!$route) { if (!$route) {
$is_page = false; $is_page = false;
$route = $this->grav['locator']->findResource('page://', true); $route = $this->grav['locator']->findResource('page://', true);
$root = true;
} }
if ($is_page) { if ($is_page) {
@@ -1500,10 +1502,7 @@ class AdminController extends AdminBaseController
} }
if ($fileInfo->isDot()) { if ($fileInfo->isDot()) {
if (!$initial) { if ($root) {
continue;
}
$payload = [ $payload = [
'name' => '<root>', 'name' => '<root>',
'value' => '', 'value' => '',
@@ -1514,6 +1513,9 @@ class AdminController extends AdminBaseController
'modified' => $fileInfo->getMTime(), 'modified' => $fileInfo->getMTime(),
'size' => 0 'size' => 0
]; ];
} else {
continue;
}
} else { } else {
$file_page = $page_instances[$fileInfo->getPathname()] ?? null; $file_page = $page_instances[$fileInfo->getPathname()] ?? null;
$file_path = Utils::replaceFirstOccurrence(GRAV_ROOT, '', $fileInfo->getPathname()); $file_path = Utils::replaceFirstOccurrence(GRAV_ROOT, '', $fileInfo->getPathname());