fixed URLs, added user permission check

dmstr · Mar 23, 2016 · 8f72e18 · 8f72e18
1 parent c5317f5
commit 8f72e18
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Module.php b/Module.php
@@ -70,12 +70,12 @@ public function init()
         if (\Yii::$app->hasModule('settings')) {
             $routes = explode("\n", \Yii::$app->settings->get('pages.availableRoutes'));
             foreach ($routes AS $route) {
-                $this->availableRoutes[$route] = $route;
+                $this->availableRoutes[trim($route)] = trim($route);
             }
 
             $views = explode("\n", \Yii::$app->settings->get('pages.availableViews'));
             foreach ($views AS $view) {
-                $this->availableViews[$view] = $view;
+                $this->availableViews[trim($view)] = trim($view);
             }
         }
     }

diff --git a/models/Tree.php b/models/Tree.php
@@ -263,7 +263,7 @@ public function createUrl($additionalParams = [])
      *
      * @return array
      */
-    public static function getMenuItems($rootName)
+    public static function getMenuItems($rootName, $checkUserPermissions = false)
     {
         // Get root node by name
         $rootCondition['name_id'] = $rootName;
@@ -320,6 +320,9 @@ public static function getMenuItems($rootName)
                     'label' => ($page->icon) ? '<i class="'.$page->icon.'"></i> '.$page->name : $page->name,
                     'url' => $page->createUrl(),
                     'linkOptions' => $pageOptions,
+                    'visible' => ($checkUserPermissions) ?
+                        Yii::$app->user->can(substr(str_replace('/', '_', $page->route), 1), ['route' => true]) :
+                        true,
                 ];
                 $item = $itemTemplate;