Do not show routes on Permissions list when advanced config is enabled.

Fix AuthItem::getItems() method too.
mdmsoft · Oct 19, 2018 · f554f7e · f554f7e
1 parent 63944f9
commit f554f7e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/models/AuthItem.php b/models/AuthItem.php
@@ -246,19 +246,20 @@ public function removeChildren($items)
     public function getItems()
     {
         $manager = Configs::authManager();
+        $advanced = Configs::instance()->advanced;
         $available = [];
         if ($this->type == Item::TYPE_ROLE) {
             foreach (array_keys($manager->getRoles()) as $name) {
                 $available[$name] = 'role';
             }
         }
         foreach (array_keys($manager->getPermissions()) as $name) {
-            $available[$name] = $name[0] == '/' ? 'route' : 'permission';
+            $available[$name] = $name[0] == '/' || $advanced && $name[0] == '@' ? 'route' : 'permission';
         }
 
         $assigned = [];
         foreach ($manager->getChildren($this->_item->name) as $item) {
-            $assigned[$item->name] = $item->type == 1 ? 'role' : ($item->name[0] == '/' ? 'route' : 'permission');
+            $assigned[$item->name] = $item->type == 1 ? 'role' : ($item->name[0] == '/' || $advanced && $item->name[0] == '@' ? 'route' : 'permission');
             unset($available[$item->name]);
         }
         unset($available[$this->name]);