Merge pull request #12 from yii2mod/create_route_asset_bundle

create route asset bundle
yii2mod · Dec 27, 2016 · e7547fa · e7547fa
2 parents a35cc08 + a143945
commit e7547fa
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 45 deletions.
diff --git a/RbacAsset.php b/RbacAsset.php
@@ -33,22 +33,4 @@ class RbacAsset extends AssetBundle
     public $depends = [
         'yii\web\YiiAsset',
     ];
-
-    /**
-     * @var bool whether RbacAsset will be register only `rbac-route.js` without `js/rbac.js`
-     */
-    public $registerOnlyRouteScript = false;
-
-    /**
-     * @inheritdoc
-     */
-    public function init()
-    {
-        if ($this->registerOnlyRouteScript) {
-            $this->js = [
-                'js/rbac-route.js',
-            ];
-        }
-        parent::init();
-    }
 }
diff --git a/views/assignment/view.php b/views/assignment/view.php
@@ -2,6 +2,9 @@
 
 use yii\helpers\Html;
 use yii\helpers\Json;
+use yii2mod\rbac\RbacAsset;
+
+RbacAsset::register($this);
 
 /* @var $this yii\web\View */
 /* @var $model \yii2mod\rbac\models\AssignmentModel */
@@ -25,4 +28,4 @@
         'removeUrl' => ['remove', 'id' => $model->userId],
     ]); ?>
 
-</div>
+</div>
diff --git a/views/item/_form.php b/views/item/_form.php
@@ -3,12 +3,9 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
-/*
- * @var $this yii\web\View
- * @var $model yii2mod\rbac\models\AuthItemModel
- */
+/* @var $this yii\web\View */
+/* @var $model yii2mod\rbac\models\AuthItemModel */
 ?>
-
 <div class="auth-item-form">
 
     <?php $form = ActiveForm::begin(); ?>
@@ -34,4 +31,4 @@
     </div>
 
     <?php ActiveForm::end(); ?>
-</div>
+</div>
diff --git a/views/item/view.php b/views/item/view.php
@@ -3,6 +3,9 @@
 use yii\helpers\Html;
 use yii\helpers\Json;
 use yii\widgets\DetailView;
+use yii2mod\rbac\RbacAsset;
+
+RbacAsset::register($this);
 
 /* @var $this yii\web\View */
 /* @var $model \yii2mod\rbac\models\AuthItemModel */
@@ -44,4 +47,4 @@
         'assignUrl' => ['assign', 'id' => $model->name],
         'removeUrl' => ['remove', 'id' => $model->name],
     ]); ?>
-</div>
+</div>
diff --git a/views/layouts/_sidebar.php b/views/layouts/_sidebar.php
@@ -1,12 +1,7 @@
 <?php
 
-use yii2mod\rbac\RbacAsset;
-
 /* @var $this \yii\web\View */
 
-Yii::$container->set(RbacAsset::className(), ['registerOnlyRouteScript' => isset($registerOnlyRouteScript) ? true : false]);
-RbacAsset::register($this);
-
 $this->params['sidebar'] = [
     [
         'label' => Yii::t('yii2mod.rbac', 'Assignments'),

diff --git a/views/route/index.php b/views/route/index.php
@@ -2,17 +2,18 @@
 
 use yii\helpers\Html;
 use yii\helpers\Json;
+use yii2mod\rbac\RbacRouteAsset;
+
+RbacRouteAsset::register($this);
 
 /* @var $this yii\web\View */
-/* @var $routes [] */
+/* @var $routes array */
 
 $this->title = Yii::t('yii2mod.rbac', 'Routes');
 $this->params['breadcrumbs'][] = $this->title;
-$this->render('/layouts/_sidebar', [
-    'registerOnlyRouteScript' => true,
-]);
+$this->render('/layouts/_sidebar');
 ?>
-    <h1><?php echo Html::encode($this->title); ?></h1>
+<h1><?php echo Html::encode($this->title); ?></h1>
 <?php echo Html::a(Yii::t('yii2mod.rbac', 'Refresh'), ['refresh'], [
     'class' => 'btn btn-primary',
     'id' => 'btn-refresh',
@@ -23,4 +24,4 @@
     ]),
     'assignUrl' => ['assign'],
     'removeUrl' => ['remove'],
-]); ?>
+]); ?>
diff --git a/views/rule/_form.php b/views/rule/_form.php
@@ -17,9 +17,13 @@
     <?php echo $form->field($model, 'className')->textInput(); ?>
 
     <div class="form-group">
-        <?php echo Html::submitButton($model->getIsNewRecord() ? Yii::t('yii2mod.rbac', 'Create') : Yii::t('yii2mod.rbac', 'Update'), [
-            'class' => $model->getIsNewRecord() ? 'btn btn-success' : 'btn btn-primary', ]); ?>
+        <?php echo Html::submitButton(
+            $model->getIsNewRecord() ? Yii::t('yii2mod.rbac', 'Create') : Yii::t('yii2mod.rbac', 'Update'),
+            [
+                'class' => $model->getIsNewRecord() ? 'btn btn-success' : 'btn btn-primary',
+            ]
+        ); ?>
     </div>
 
     <?php ActiveForm::end(); ?>
-</div>
+</div>
diff --git a/views/rule/view.php b/views/rule/view.php
@@ -3,10 +3,8 @@
 use yii\helpers\Html;
 use yii\widgets\DetailView;
 
-/*
- * @var yii\web\View $this
- * @var \yii2mod\rbac\models\BizRuleModel $model
- */
+/* @var $this yii\web\View */
+/* @var $model \yii2mod\rbac\models\BizRuleModel */
 
 $this->title = Yii::t('yii2mod.rbac', 'Rule : {0}', $model->name);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('yii2mod.rbac', 'Rules'), 'url' => ['index']];
@@ -34,4 +32,4 @@
         ],
     ]); ?>
 
-</div>
+</div>