Fixed bugs

skeeks-cms · Sep 8, 2016 · d14b5da · d14b5da
1 parent d455559
commit d14b5da
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 ==============
 
+1.0.2
+-----------------
+ * Fixed bugs
+
 1.0.1
 -----------------
  * To read app configs

diff --git a/controllers/AdminPermissionController.php b/controllers/AdminPermissionController.php
@@ -165,7 +165,10 @@ public function actionView()
             if (in_array($name, $children)) {
                 continue;
             }
-            $avaliable[$name[0] === '/' ? 'Routes' : 'Permission'][$name] = $name . ' — ' . $role->description;;
+            if (isset($name[0]))
+            {
+                $avaliable[$name[0] === '/' ? 'Routes' : 'Permission'][$name] = $name . ' — ' . $role->description;
+            }
         }
         foreach ($authManager->getChildren($id) as $name => $child) {
             $assigned[$name[0] === '/' ? 'Routes' : 'Permission'][$name] = $name . ' — ' . $child->description;;

diff --git a/controllers/AdminRoleController.php b/controllers/AdminRoleController.php
@@ -126,7 +126,11 @@ public function actionView()
             if (in_array($name, $children)) {
                 continue;
             }
-            $avaliable[$name[0] === '/' ? 'Routes' : 'Permission'][$name] = $name  . ' — ' . $role->description;
+
+            if (isset($name[0]))
+            {
+                $avaliable[$name[0] === '/' ? 'Routes' : 'Permission'][$name] = $name  . ' — ' . $role->description;
+            }
         }
         foreach ($authManager->getChildren($id) as $name => $child) {
             if ($child->type == Item::TYPE_ROLE) {

diff --git a/models/AuthItem.php b/models/AuthItem.php
@@ -8,6 +8,7 @@
 
 namespace skeeks\cms\rbac\models;
 use Yii;
+use yii\helpers\ArrayHelper;
 use yii\rbac\Item;
 use yii\helpers\Json;
 /**
@@ -58,6 +59,7 @@ public function rules()
             [['ruleName'], 'in',
                 'range' => array_keys(Yii::$app->authManager->getRules()),
                 'message' => 'Rule not exists'],
+            //[['name'], 'unique', 'targetAttribute' => array_keys(ArrayHelper::map(\Yii::$app->authManager->getRoles(), 'name', 'name')) ],
             [['name', 'type'], 'required'],
             [['type'], 'integer'],
             [['description', 'data', 'ruleName'], 'default'],

diff --git a/views/admin-permission/_form.php b/views/admin-permission/_form.php
@@ -43,7 +43,7 @@
         ])
     ?>
 
-    <?= $form->field($model, 'data')->textarea(['rows' => 6, 'readonly' => 'readonly'])->label(\Yii::t('app','Data')) ?>
+    <?/*= $form->field($model, 'data')->textarea(['rows' => 6, 'readonly' => 'readonly'])->label(\Yii::t('app','Data')) */?>
 
     <?= $form->buttonsCreateOrUpdate($model); ?>
 

diff --git a/views/admin-role/_form.php b/views/admin-role/_form.php
@@ -24,7 +24,7 @@
     ])
     */?>
 
-    <?= $form->field($model, 'data')->textarea(['rows' => 6, 'readonly' => 'readonly'])->label(\Yii::t('app','Data')) ?>
+    <?/*= $form->field($model, 'data')->textarea(['rows' => 6, 'readonly' => 'readonly'])->label(\Yii::t('app','Data')) */?>
 
     <?= $form->buttonsCreateOrUpdate($model); ?>
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,7 +43,7 @@ @@
             ])
         ?>
-        <?= $form->field($model, 'data')->textarea(['rows' => 6, 'readonly' => 'readonly'])->label(\Yii::t('app','Data')) ?>
+        <?/*= $form->field($model, 'data')->textarea(['rows' => 6, 'readonly' => 'readonly'])->label(\Yii::t('app','Data')) */?>
         <?= $form->buttonsCreateOrUpdate($model); ?>
@@ Expand Down @@