@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace mdm\admin\models\form; |
| 4 | 4 | |
| 5 | -use Yii; |
|
| 6 | 5 | use mdm\admin\models\User; |
| 7 | 6 | use yii\base\InvalidParamException; |
| 8 | 7 | use yii\base\Model; |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace mdm\admin\models\searchs; |
| 4 | 4 | |
| 5 | -use Yii; |
|
| 6 | 5 | use yii\base\Model; |
| 7 | 6 | use yii\data\ActiveDataProvider; |
| 8 | 7 | use mdm\admin\models\Menu as MenuModel; |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | echo Nav::widget([ |
| 39 | 39 | 'options' => ['class' => 'nav navbar-nav navbar-right'], |
| 40 | 40 | 'items' => $this->context->module->navbar, |
| 41 | - ]); |
|
| 41 | + ]); |
|
| 42 | 42 | NavBar::end(); |
| 43 | 43 | ?> |
| 44 | 44 | |
@@ -64,13 +64,13 @@ |
||
| 64 | 64 | $items = $authManager->getRoles(); |
| 65 | 65 | } else { |
| 66 | 66 | $items = array_filter($authManager->getPermissions(), function($item) use ($advanced){ |
| 67 | - $isPermission = $this->type == Item::TYPE_PERMISSION; |
|
| 68 | - if ($advanced) { |
|
| 67 | + $isPermission = $this->type == Item::TYPE_PERMISSION; |
|
| 68 | + if ($advanced) { |
|
| 69 | 69 | return $isPermission xor (strncmp($item->name, '/', 1) === 0 or strncmp($item->name, '@', 1) === 0); |
| 70 | - } |
|
| 71 | - else { |
|
| 70 | + } |
|
| 71 | + else { |
|
| 72 | 72 | return $isPermission xor strncmp($item->name, '/', 1) === 0; |
| 73 | - } |
|
| 73 | + } |
|
| 74 | 74 | }); |
| 75 | 75 | } |
| 76 | 76 | $this->load($params); |