prepare new release depend on new deesoft/yii2-angular ext.

mdmunir · mdmunir · commit 8d1e133c6efa · 2015-09-05T14:07:03.000+07:00
diff --git a/composer.json b/composer.json
@@ -15,8 +15,8 @@
         }
     ],
     "require": {
-        "yiisoft/yii2": ">=2.0.4",
-        "deesoft/yii2-angular": "~1.2",
+        "yiisoft/yii2": ">=2.0.6",
+        "deesoft/yii2-angular": "~1.3",
         "deesoft/yii2-adminlte": "~1.0"
     },
     "autoload": {
diff --git a/controllers/AssignmentController.php b/controllers/AssignmentController.php
@@ -23,7 +23,7 @@ class AssignmentController extends Controller
     protected function verbs()
     {
         return[
-            'index' => ['GET'],
+            'index' => ['GET', 'HEAD'],
             'view' => ['GET'],
             'assign' => ['POST'],
             'revoke' => ['POST'],
diff --git a/controllers/ItemController.php b/controllers/ItemController.php
@@ -21,8 +21,8 @@ class ItemController extends Controller
     protected function verbs()
     {
         return[
-            'index'=>['GET'],
-            'view'=>['GET'],
+            'index'=>['GET', 'HEAD'],
+            'view'=>['GET', 'HEAD'],
             'create'=>['POST'],
             'update'=>['PUT'],
             'delete'=>['DELETE'],
diff --git a/controllers/MenuController.php b/controllers/MenuController.php
@@ -21,8 +21,8 @@ class MenuController extends Controller
     protected function verbs()
     {
         return[
-            'index' => ['GET'],
-            'view' => ['GET'],
+            'index' => ['GET', 'HEAD'],
+            'view' => ['GET', 'HEAD'],
             'update' => ['POST', 'PUT'],
             'create' => ['POST'],
             'delete' => ['DELETE'],
diff --git a/controllers/RouteController.php b/controllers/RouteController.php
@@ -24,7 +24,7 @@ class RouteController extends Controller
     protected function verbs()
     {
         return[
-            'index' => ['GET'],
+            'index' => ['GET', 'HEAD'],
             'add' => ['POST'],
             'remove' => ['POST'],
         ];
diff --git a/controllers/RuleController.php b/controllers/RuleController.php
@@ -20,8 +20,8 @@ class RuleController extends Controller
     protected function verbs()
     {
         return[
-            'index' => ['GET'],
-            'view' => ['GET'],
+            'index' => ['GET', 'HEAD'],
+            'view' => ['GET', 'HEAD'],
             'create' => ['POST'],
             'update' => ['POST'],
             'delete' => ['DELETE'],
diff --git a/models/AuthItem.php b/models/AuthItem.php
@@ -27,6 +27,7 @@ class AuthItem extends \yii\base\Model
     public $description;
     public $ruleName;
     public $data;
+    private $_data;
 
     /**
      * @var Item
@@ -66,7 +67,8 @@ public function rules()
             }],
             [['type'], 'integer'],
             [['description', 'data', 'ruleName'], 'default'],
-            [['name'], 'string', 'max' => 64]
+            [['name'], 'string', 'max' => 64],
+            [['data'], 'jsonDecode'],
         ];
     }
 
@@ -84,6 +86,38 @@ public function unique()
         }
     }
 
+    public function jsonDecode()
+    {
+        if (is_array($this->data)) {
+            $this->addError('data', Yii::t('rbac-admin', 'Invalid JSON data.'));
+            return;
+        }
+        $decode = json_decode((string) $this->data, true);
+        switch (json_last_error()) {
+            case JSON_ERROR_NONE:
+                $this->_data = $decode;
+                break;
+            case JSON_ERROR_DEPTH:
+                $this->addError('data', 'The maximum stack depth has been exceeded.');
+                break;
+            case JSON_ERROR_CTRL_CHAR:
+                $this->addError('data', 'Control character error, possibly incorrectly encoded.');
+                break;
+            case JSON_ERROR_SYNTAX:
+                $this->addError('data', 'Syntax error.');
+                break;
+            case JSON_ERROR_STATE_MISMATCH:
+                $this->addError('data', 'Invalid or malformed JSON.');
+                break;
+            case JSON_ERROR_UTF8:
+                $this->addError('data', 'Malformed UTF-8 characters, possibly incorrectly encoded.');
+                break;
+            default:
+                $this->addError('data', 'Unknown JSON decoding error.');
+                break;
+        }
+    }
+
     /**
      * @inheritdoc
      */
@@ -145,7 +179,7 @@ public function save()
             $this->_item->name = $this->name;
             $this->_item->description = $this->description;
             $this->_item->ruleName = $this->ruleName;
-            $this->_item->data = $this->data === null || $this->data === '' ? null : Json::decode($this->data);
+            $this->_item->data = $this->_data;
             if ($isNew) {
                 $manager->add($this->_item);
             } else {
diff --git a/views/default/index.php b/views/default/index.php
@@ -17,7 +17,7 @@
     <?=
     NgView::widget([
         'name' => 'dAdmin',
-        'requires' => ['ui.bootstrap', 'ngResource', 'dee'],
+        'requires' => ['ui.bootstrap', 'ngResource', 'dee.ui'],
         'routes' => [
             '/' => [
                 'redirectTo' => '/assignment',
diff --git a/views/default/permission/view.php b/views/default/permission/view.php
@@ -41,7 +41,9 @@
                             <label class="col-sm-3 control-label"><?= Yii::t('rbac-admin', 'Rule')?></label>
                             <div class="col-sm-9">
                                 <select ng-if="isEdit" class="form-control" ng-model="edit.ruleName"
-                                        ng-options="rule for rule in rules"></select>
+                                        ng-options="rule for rule in rules">
+                                    <option></option>
+                                </select>
                                 <div ng-if="isEdit && modelError.name" class="help-block">{{modelError.ruleName}}</div>
                                 <p ng-if="!isEdit" class="form-control-static">{{model.ruleName}}</p>
                             </div>
diff --git a/views/default/role/form.php b/views/default/role/form.php
@@ -39,7 +39,9 @@
                 <label class="col-sm-3 control-label"><?= Yii::t('rbac-admin', 'Rule')?></label>
                 <div class="col-sm-9">
                     <select class="form-control" ng-model="model.ruleName"
-                            ng-options="rule.name for rule in rules"></select>
+                            ng-options="rule.name for rule in rules">
+                        <option></option>
+                    </select>
                     <div ng-if="modelError.ruleName" class="help-block">{{modelError.ruleName}}</div>
                 </div>
             </div>
diff --git a/views/default/role/view.php b/views/default/role/view.php
@@ -41,7 +41,9 @@
                             <label class="col-sm-3 control-label"><?= Yii::t('rbac-admin', 'Rule')?></label>
                             <div class="col-sm-9">
                                 <select ng-if="isEdit" class="form-control" ng-model="edit.ruleName"
-                                        ng-options="rule for rule in rules"></select>
+                                        ng-options="rule for rule in rules">
+                                    <option></option>
+                                </select>
                                 <div ng-if="isEdit && modelError.name" class="help-block">{{modelError.ruleName}}</div>
                                 <p ng-if="!isEdit" class="form-control-static">{{model.ruleName}}</p>
                             </div>
diff --git a/views/default/rule/index.js b/views/default/rule/index.js
@@ -59,6 +59,7 @@ $scope.deleteItem = function (item) {
     if (confirm('Are you sure you want to delete?')) {
         Rule.remove({id: item.name}, {}, function () {
             addAlert('info', 'Rule deleted');
+            query();
         }, function (r) {
             addAlert('error', r.statusText);
         });
diff --git a/views/default/rule/index.php b/views/default/rule/index.php
@@ -39,7 +39,7 @@
                         <td>{{model.name}}</td>
                         <td><a href ng-click="showItem(model)">{{model.className}}</a></td>
                         <td width="60px">
-                            <a href ng-click="deleteItem(model)"><span class="glyphicon glyphicon-trash"></span></a>
+                            <a href ng-click="deleteItem(model)" ng-if="model.name != 'route_rule'"><span class="glyphicon glyphicon-trash"></span></a>
                             <a href ng-click="editItem(model)"><span class="glyphicon glyphicon-pencil"></span></a>
                         </td>
                     </tr>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class AssignmentController extends Controller`
`23`	`23`	`protected function verbs()`
`24`	`24`	`{`
`25`	`25`	`return[`
`26`		`- 'index' => ['GET'],`
	`26`	`+ 'index' => ['GET', 'HEAD'],`
`27`	`27`	`'view' => ['GET'],`
`28`	`28`	`'assign' => ['POST'],`
`29`	`29`	`'revoke' => ['POST'],`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class RouteController extends Controller`
`24`	`24`	`protected function verbs()`
`25`	`25`	`{`
`26`	`26`	`return[`
`27`		`- 'index' => ['GET'],`
	`27`	`+ 'index' => ['GET', 'HEAD'],`
`28`	`28`	`'add' => ['POST'],`
`29`	`29`	`'remove' => ['POST'],`
`30`	`30`	`];`