Merge pull request #5 from justcoded/permissions_tree_selector

Role/Permission unique name fix

CHANGELOG.md

@@ -5,6 +5,7 @@ v1.1
 ---------------------
 * Role permission selector now have better UI with real trees.
 * Bugfix: Item name validation not allow '*'.
+* Bugfix: Fatal error on creating Role/Permission with existed name.
 
 v1.0.1
 ---------------------

src/forms/PermissionForm.php

@@ -60,8 +60,12 @@ public function attributeHints()
 	 */
 	public function uniqueItemName($attribute, $params, $validator)
 	{
-		$permission = Permission::getList();
-		return ! isset($permission[$this->$attribute]);
+		$name = $this->$attribute;
+		if ($item = Permission::find($name)) {
+			$this->addError($attribute, 'Permission with the same name is already exists.');
+			return false;
+		}
+		return true;
 	}
 
 	/**

src/forms/RoleForm.php

@@ -80,8 +80,12 @@ public function attributeHints()
 	 */
 	public function uniqueItemName($attribute, $params, $validator)
 	{
-		$permission = Role::getList();
-		return ! isset($permission[$this->$attribute]);
+		$name = $this->$attribute;
+		if ($item = Role::find($name)) {
+			$this->addError($attribute, 'Role with the same name is already exists.');
+			return false;
+		}
+		return true;
 	}
 
 	/**
@@ -138,16 +142,18 @@ public function save()
 	public function getInheritPermissions()
 	{
 		$herited = [];
-		foreach ($this->childRoles as $roleName) {
-			$permissions = Yii::$app->authManager->getPermissionsByRole($roleName);
-			$herited = array_merge(
-				$herited,
-				array_keys($permissions)
-			);
-		}
+		if (!empty($this->childRoles)) {
+			foreach ($this->childRoles as $roleName) {
+				$permissions = Yii::$app->authManager->getPermissionsByRole($roleName);
+				$herited = array_merge(
+					$herited,
+					array_keys($permissions)
+				);
+			}
 
-		$herited = array_unique($herited);
-		$herited = array_combine($herited, $herited);
+			$herited = array_unique($herited);
+			$herited = array_combine($herited, $herited);
+		}
 		return $herited;
 	}
 

src/views/roles/_permissions.php

@@ -16,11 +16,13 @@
 $this->registerJs('window.inheritPermissions = ' . Json::encode(array_values($inheritTree)), View::POS_BEGIN);
 ?>
 <div class="row js-tree-box">
-	<div class="col-md-3">
-		<h4>Inherit Permissions</h4>
-		<input type="text" class="simple-input" id="inheritSearch" placeholder="Search..." />
-		<div id="inheritPermissions"></div>
-	</div>
+	<?php if ($model::SCENARIO_CREATE !== $model->scenario) : ?>
+		<div class="col-md-3">
+			<h4>Inherit Permissions</h4>
+			<input type="text" class="simple-input" id="inheritSearch" placeholder="Search..." />
+			<div id="inheritPermissions"></div>
+		</div>
+	<?php endif; ?>
 	<div class="col-md-4">
 		<h4>Allowed Permissions</h4>
 		<input type="text" class="simple-input" id="allowSearch" placeholder="Search..." />