Resolved changelog conflicts with master

Author: aprokopenko

CHANGELOG.md

@@ -13,15 +13,16 @@ v1.1.1
 v1.1
 ---------------------
 * NEW: Permissions selector as a real Tree-based selector.
-* Bugfix: Fix wrong unique name validations for Role and Permission creating form
+* Bugfix: Fix wrong unique name validations for Role and Permission creating form.
+* Bugfix: Fatal error on creating Role/Permission with existed name.
 
 v1.0.2
 ---------------------
 * Bugfix: Routes Scanner take info from comments as well, not class definition.
 
 v1.0.1
 ---------------------
-* Disable inherit permissions in role permissions multi-select box.
+* Disable inherit permissions in role permissions selector.
 
 v1.0
 ---------------------

composer.json

@@ -18,12 +18,12 @@
  "minimum-stability": "dev",
  "require": {
  "php": ">=7.0.0",
- "yiisoft/yii2": "~2.0.11",
+ "yiisoft/yii2": "~2.0.12",
  "kartik-v/yii2-widget-select2": "~2.1.0"
  },
  "autoload": {
  "psr-4": {
  "justcoded\\yii2\\rbac\\": "src/"
  }
  }
-}
+}

src/Module.php

@@ -6,18 +6,7 @@
 class Module extends \yii\base\Module
 {
 
-public $defaultRoute = 'index';
-
-//
-//	public $module = 'admin';
-//
-//	public $layoutPath = '@admin/views/layout/main';
-//
-//
-//	public $urlRules = [
-//	'admin/permissions' => 'admin/rbac/permissions',
-//	'admin/rbac/permissions' => 'admin/permissions'
-//	];
+public $defaultRoute = 'permissions/index';
 
 public function init()
 {

src/assets/RbacAssetBundle.php

@@ -7,10 +7,13 @@ class RbacAssetBundle extends \yii\web\AssetBundle
 public $sourcePath = '@vendor/justcoded/yii2-rbac/src/assets';
 
 public $css = [
+'css/jstree.min.css',
+'css/custom.css',
 ];
 
 public $js = [
-'js/multiselect.min.js',
+'js/jstree.min.js',
+'js/jstree-double-panel.js',
 'js/rbac.js'
 ];
 public $depends = [

src/assets/css/32px.png

@@ -0,0 +1,88 @@
+.js-tree-box{
+color: #212529;
+font-size: 16px;
+}
+.js-tree-box .label{
+display: block;
+margin: 0 0 10px;
+color: #212529;
+padding: 0;
+font-size: 16px;
+font-weight: normal;
+text-align: left;
+}
+.js-tree-box .simple-input{
+display: block;
+color: #a3a3a3;
+width: 100%;
+height: 34px;
+padding: 0 10px;
+border: 1px solid #d7dbe2;
+outline: none;
+flex-shrink: 0;
+}
+.js-tree-box .btn-simple{
+display: block;
+font-size: 0;
+color: #3a3a3a;
+background: #f2f2f2;
+width: 100%;
+height: 34px;
+padding: 0 10px;
+border: none;
+border-radius: 3px;
+outline: none;
+transition: background 0.3s ease-in-out;
+cursor: pointer;
+margin: 0 0 5px;
+position: relative;
+}
+.js-tree-box .btn-simple:before{
+content: '';
+position: absolute;
+top: 50%;
+left: 50%;
+margin-left: -7px;
+margin-top: -7px;
+background: url(../images/next.png) no-repeat 50% 50%;
+background-size: contain;
+width: 14px;
+height: 14px;
+pointer-events: none;
+}
+.js-tree-box .btn-simple.add-all:before{
+background: url(../images/next.png) no-repeat 50% 50%;
+}
+.js-tree-box .btn-simple.remove-all:before{
+background: url(../images/prev.png) no-repeat 50% 50%;
+}
+.js-tree-box .btn-simple.add:before{
+background: url(../images/right.png) no-repeat 50% 50%;
+}
+.js-tree-box .btn-simple.remove:before{
+background: url(../images/left.png) no-repeat 50% 50%;
+}
+.js-tree-box .btn-simple:hover{
+background-color: #dad8d8;
+}
+.js-tree-box .btn-holder{
+padding: 120px 0 0;
+}
+.js-tree-box .jstree{
+padding: 30px 0;
+border: 1px solid #d7dbe2;
+border-top-width: 0;
+height: 300px;
+overflow: auto;
+}
+.jstree-default .jstree-disabled {
+opacity: 0.5;
+}
+@media (max-width: 767px){
+.js-tree-box .btn-holder{
+padding: 34px 0;
+}
+.js-tree-box .btn-simple:before{
+transform: rotate(90deg);
+}
+}