@@ -61,7 +61,7 @@ |
||
61 | 61 | return [ |
62 | 62 | [['ruleName'], 'checkRule'], |
63 | 63 | [['name', 'type'], 'required'], |
64 | - [['name'], 'unique', 'when' => function () { |
|
64 | + [['name'], 'unique', 'when' => function() { |
|
65 | 65 | return $this->isNewRecord || ($this->_item->name != $this->name); |
66 | 66 | }], |
67 | 67 | [['type'], 'integer'], |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | public function getMenus() |
119 | 119 | { |
120 | 120 | if ($this->_normalizeMenus === null) { |
121 | - $mid = '/' . $this->getUniqueId() . '/'; |
|
121 | + $mid = '/'.$this->getUniqueId().'/'; |
|
122 | 122 | // resolve core menus |
123 | 123 | $this->_normalizeMenus = []; |
124 | 124 | |
@@ -130,11 +130,11 @@ discard block |
||
130 | 130 | ]; |
131 | 131 | foreach ($this->_coreItems as $id => $lable) { |
132 | 132 | if (!isset($conditions[$id]) || $conditions[$id]) { |
133 | - $this->_normalizeMenus[$id] = ['label' => Yii::t('rbac-admin', $lable), 'url' => [$mid . $id]]; |
|
133 | + $this->_normalizeMenus[$id] = ['label' => Yii::t('rbac-admin', $lable), 'url' => [$mid.$id]]; |
|
134 | 134 | } |
135 | 135 | } |
136 | 136 | foreach (array_keys($this->controllerMap) as $id) { |
137 | - $this->_normalizeMenus[$id] = ['label' => Yii::t('rbac-admin', Inflector::humanize($id)), 'url' => [$mid . $id]]; |
|
137 | + $this->_normalizeMenus[$id] = ['label' => Yii::t('rbac-admin', Inflector::humanize($id)), 'url' => [$mid.$id]]; |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | // user configure menus |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $this->_normalizeMenus[$id] = isset($this->_normalizeMenus[$id]) ? array_merge($this->_normalizeMenus[$id], $value) |
150 | 150 | : $value; |
151 | 151 | if (!isset($this->_normalizeMenus[$id]['url'])) { |
152 | - $this->_normalizeMenus[$id]['url'] = [$mid . $id]; |
|
152 | + $this->_normalizeMenus[$id]['url'] = [$mid.$id]; |
|
153 | 153 | } |
154 | 154 | } |
155 | 155 | } |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | $view->params['breadcrumbs'][] = [ |
179 | 179 | 'label' => ($this->defaultUrlLabel ?: Yii::t('rbac-admin', 'Admin')), |
180 | - 'url' => ['/' . ($this->defaultUrl ?: $this->uniqueId)], |
|
180 | + 'url' => ['/'.($this->defaultUrl ?: $this->uniqueId)], |
|
181 | 181 | ]; |
182 | 182 | return true; |
183 | 183 | } |
@@ -26,15 +26,15 @@ discard block |
||
26 | 26 | $animateIcon = ' <i class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></i>'; |
27 | 27 | ?> |
28 | 28 | <div class="auth-item-view"> |
29 | - <h1><?=Html::encode($this->title);?></h1> |
|
29 | + <h1><?=Html::encode($this->title); ?></h1> |
|
30 | 30 | <p> |
31 | - <?=Html::a(Yii::t('rbac-admin', 'Update'), ['update', 'id' => $model->name], ['class' => 'btn btn-primary']);?> |
|
31 | + <?=Html::a(Yii::t('rbac-admin', 'Update'), ['update', 'id' => $model->name], ['class' => 'btn btn-primary']); ?> |
|
32 | 32 | <?=Html::a(Yii::t('rbac-admin', 'Delete'), ['delete', 'id' => $model->name], [ |
33 | 33 | 'class' => 'btn btn-danger', |
34 | 34 | 'data-confirm' => Yii::t('rbac-admin', 'Are you sure to delete this item?'), |
35 | 35 | 'data-method' => 'post', |
36 | -]);?> |
|
37 | - <?=Html::a(Yii::t('rbac-admin', 'Create'), ['create'], ['class' => 'btn btn-success']);?> |
|
36 | +]); ?> |
|
37 | + <?=Html::a(Yii::t('rbac-admin', 'Create'), ['create'], ['class' => 'btn btn-success']); ?> |
|
38 | 38 | </p> |
39 | 39 | <div class="row"> |
40 | 40 | <div class="col-sm-11"> |
@@ -55,25 +55,25 @@ discard block |
||
55 | 55 | <div class="row"> |
56 | 56 | <div class="col-sm-5"> |
57 | 57 | <input class="form-control search" data-target="available" |
58 | - placeholder="<?=Yii::t('rbac-admin', 'Search for available');?>"> |
|
58 | + placeholder="<?=Yii::t('rbac-admin', 'Search for available'); ?>"> |
|
59 | 59 | <select multiple size="20" class="form-control list" data-target="available"></select> |
60 | 60 | </div> |
61 | 61 | <div class="col-sm-1"> |
62 | 62 | <br><br> |
63 | - <?=Html::a('>>' . $animateIcon, ['assign', 'id' => $model->name], [ |
|
63 | + <?=Html::a('>>'.$animateIcon, ['assign', 'id' => $model->name], [ |
|
64 | 64 | 'class' => 'btn btn-success btn-assign', |
65 | 65 | 'data-target' => 'available', |
66 | 66 | 'title' => Yii::t('rbac-admin', 'Assign'), |
67 | -]);?><br><br> |
|
68 | - <?=Html::a('<<' . $animateIcon, ['remove', 'id' => $model->name], [ |
|
67 | +]); ?><br><br> |
|
68 | + <?=Html::a('<<'.$animateIcon, ['remove', 'id' => $model->name], [ |
|
69 | 69 | 'class' => 'btn btn-danger btn-assign', |
70 | 70 | 'data-target' => 'assigned', |
71 | 71 | 'title' => Yii::t('rbac-admin', 'Remove'), |
72 | -]);?> |
|
72 | +]); ?> |
|
73 | 73 | </div> |
74 | 74 | <div class="col-sm-5"> |
75 | 75 | <input class="form-control search" data-target="assigned" |
76 | - placeholder="<?=Yii::t('rbac-admin', 'Search for assigned');?>"> |
|
76 | + placeholder="<?=Yii::t('rbac-admin', 'Search for assigned'); ?>"> |
|
77 | 77 | <select multiple size="20" class="form-control list" data-target="assigned"></select> |
78 | 78 | </div> |
79 | 79 | </div> |
@@ -12,11 +12,11 @@ discard block |
||
12 | 12 | |
13 | 13 | $userName = $model->{$usernameField}; |
14 | 14 | if (!empty($fullnameField)) { |
15 | - $userName .= ' (' . ArrayHelper::getValue($model, $fullnameField) . ')'; |
|
15 | + $userName .= ' ('.ArrayHelper::getValue($model, $fullnameField).')'; |
|
16 | 16 | } |
17 | 17 | $userName = Html::encode($userName); |
18 | 18 | |
19 | -$this->title = Yii::t('rbac-admin', 'Assignment') . ' : ' . $userName; |
|
19 | +$this->title = Yii::t('rbac-admin', 'Assignment').' : '.$userName; |
|
20 | 20 | |
21 | 21 | $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', 'Assignments'), 'url' => ['index']]; |
22 | 22 | $this->params['breadcrumbs'][] = $userName; |
@@ -31,31 +31,31 @@ discard block |
||
31 | 31 | $animateIcon = ' <i class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></i>'; |
32 | 32 | ?> |
33 | 33 | <div class="assignment-index"> |
34 | - <h1><?=$this->title;?></h1> |
|
34 | + <h1><?=$this->title; ?></h1> |
|
35 | 35 | |
36 | 36 | <div class="row"> |
37 | 37 | <div class="col-sm-5"> |
38 | 38 | <input class="form-control search" data-target="available" |
39 | - placeholder="<?=Yii::t('rbac-admin', 'Search for available');?>"> |
|
39 | + placeholder="<?=Yii::t('rbac-admin', 'Search for available'); ?>"> |
|
40 | 40 | <select multiple size="20" class="form-control list" data-target="available"> |
41 | 41 | </select> |
42 | 42 | </div> |
43 | 43 | <div class="col-sm-1"> |
44 | 44 | <br><br> |
45 | - <?=Html::a('>>' . $animateIcon, ['assign', 'id' => (string) $model->id], [ |
|
45 | + <?=Html::a('>>'.$animateIcon, ['assign', 'id' => (string)$model->id], [ |
|
46 | 46 | 'class' => 'btn btn-success btn-assign', |
47 | 47 | 'data-target' => 'available', |
48 | 48 | 'title' => Yii::t('rbac-admin', 'Assign'), |
49 | -]);?><br><br> |
|
50 | - <?=Html::a('<<' . $animateIcon, ['revoke', 'id' => (string) $model->id], [ |
|
49 | +]); ?><br><br> |
|
50 | + <?=Html::a('<<'.$animateIcon, ['revoke', 'id' => (string)$model->id], [ |
|
51 | 51 | 'class' => 'btn btn-danger btn-assign', |
52 | 52 | 'data-target' => 'assigned', |
53 | 53 | 'title' => Yii::t('rbac-admin', 'Remove'), |
54 | -]);?> |
|
54 | +]); ?> |
|
55 | 55 | </div> |
56 | 56 | <div class="col-sm-5"> |
57 | 57 | <input class="form-control search" data-target="assigned" |
58 | - placeholder="<?=Yii::t('rbac-admin', 'Search for assigned');?>"> |
|
58 | + placeholder="<?=Yii::t('rbac-admin', 'Search for assigned'); ?>"> |
|
59 | 59 | <select multiple size="20" class="form-control list" data-target="assigned"> |
60 | 60 | </select> |
61 | 61 | </div> |
@@ -20,17 +20,17 @@ discard block |
||
20 | 20 | $this->registerJs($this->render('_script.js')); |
21 | 21 | $animateIcon = ' <i class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></i>'; |
22 | 22 | ?> |
23 | -<h1><?=Html::encode($this->title);?></h1> |
|
23 | +<h1><?=Html::encode($this->title); ?></h1> |
|
24 | 24 | <div class="row"> |
25 | 25 | <div class="col-sm-11"> |
26 | 26 | <div class="input-group"> |
27 | 27 | <input id="inp-route" type="text" class="form-control" |
28 | - placeholder="<?=Yii::t('rbac-admin', 'New route(s)');?>"> |
|
28 | + placeholder="<?=Yii::t('rbac-admin', 'New route(s)'); ?>"> |
|
29 | 29 | <span class="input-group-btn"> |
30 | - <?=Html::a(Yii::t('rbac-admin', 'Add') . $animateIcon, ['create'], [ |
|
30 | + <?=Html::a(Yii::t('rbac-admin', 'Add').$animateIcon, ['create'], [ |
|
31 | 31 | 'class' => 'btn btn-success', |
32 | 32 | 'id' => 'btn-new', |
33 | -]);?> |
|
33 | +]); ?> |
|
34 | 34 | </span> |
35 | 35 | </div> |
36 | 36 | </div> |
@@ -40,32 +40,32 @@ discard block |
||
40 | 40 | <div class="col-sm-5"> |
41 | 41 | <div class="input-group"> |
42 | 42 | <input class="form-control search" data-target="available" |
43 | - placeholder="<?=Yii::t('rbac-admin', 'Search for available');?>"> |
|
43 | + placeholder="<?=Yii::t('rbac-admin', 'Search for available'); ?>"> |
|
44 | 44 | <span class="input-group-btn"> |
45 | 45 | <?=Html::a('<span class="glyphicon glyphicon-refresh"></span>', ['refresh'], [ |
46 | 46 | 'class' => 'btn btn-default', |
47 | 47 | 'id' => 'btn-refresh', |
48 | -]);?> |
|
48 | +]); ?> |
|
49 | 49 | </span> |
50 | 50 | </div> |
51 | 51 | <select multiple size="20" class="form-control list" data-target="available"></select> |
52 | 52 | </div> |
53 | 53 | <div class="col-sm-1"> |
54 | 54 | <br><br> |
55 | - <?=Html::a('>>' . $animateIcon, ['assign'], [ |
|
55 | + <?=Html::a('>>'.$animateIcon, ['assign'], [ |
|
56 | 56 | 'class' => 'btn btn-success btn-assign', |
57 | 57 | 'data-target' => 'available', |
58 | 58 | 'title' => Yii::t('rbac-admin', 'Assign'), |
59 | -]);?><br><br> |
|
60 | - <?=Html::a('<<' . $animateIcon, ['remove'], [ |
|
59 | +]); ?><br><br> |
|
60 | + <?=Html::a('<<'.$animateIcon, ['remove'], [ |
|
61 | 61 | 'class' => 'btn btn-danger btn-assign', |
62 | 62 | 'data-target' => 'assigned', |
63 | 63 | 'title' => Yii::t('rbac-admin', 'Remove'), |
64 | -]);?> |
|
64 | +]); ?> |
|
65 | 65 | </div> |
66 | 66 | <div class="col-sm-5"> |
67 | 67 | <input class="form-control search" data-target="assigned" |
68 | - placeholder="<?=Yii::t('rbac-admin', 'Search for assigned');?>"> |
|
68 | + placeholder="<?=Yii::t('rbac-admin', 'Search for assigned'); ?>"> |
|
69 | 69 | <select multiple size="20" class="form-control list" data-target="assigned"></select> |
70 | 70 | </div> |
71 | 71 | </div> |