@@ -11,9 +11,11 @@ |
||
| 11 | 11 | <?php foreach ($fields as $field): |
| 12 | 12 | if (empty($field['decorators'])): ?> |
| 13 | 13 | '<?= $field['property'] ?>', |
| 14 | -<?php else: ?> |
|
| 14 | +<?php else { |
|
| 15 | + : ?> |
|
| 15 | 16 | <?= "'{$field['property']}' => \$this->{$field['decorators']}" ?>, |
| 16 | 17 | <?php endif; |
| 18 | +} |
|
| 17 | 19 | endforeach; ?> |
| 18 | 20 | ], $tableOptions); |
| 19 | 21 | <?= $this->render('_addForeignKeys', [ |
@@ -123,7 +123,7 @@ |
||
| 123 | 123 | if (($model = Admin::findOne($id)) !== null) { |
| 124 | 124 | return $model; |
| 125 | 125 | } else { |
| 126 | - throw new NotFoundHttpException (Yii::t('yuncms', 'The requested page does not exist.')); |
|
| 126 | + throw new NotFoundHttpException(Yii::t('yuncms', 'The requested page does not exist.')); |
|
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | } |
@@ -72,8 +72,8 @@ |
||
| 72 | 72 | |
| 73 | 73 | $options = $this->clientOptions !== false && !empty($this->clientOptions) ? Json::encode($this->clientOptions) : 'null'; |
| 74 | 74 | |
| 75 | - foreach($this->dataSets as $dataSet) { |
|
| 76 | - if(empty($dataSet)) { |
|
| 75 | + foreach ($this->dataSets as $dataSet) { |
|
| 76 | + if (empty($dataSet)) { |
|
| 77 | 77 | continue; |
| 78 | 78 | } |
| 79 | 79 | $dataSets[] = Json::encode($dataSet); |
@@ -230,7 +230,7 @@ |
||
| 230 | 230 | } |
| 231 | 231 | return implode(' ', $result); |
| 232 | 232 | } |
| 233 | - return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function ($matches) use ($user) { |
|
| 233 | + return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function($matches) use ($user) { |
|
| 234 | 234 | return static::checkRoute($matches[1], [], $user) ? "{{$matches[1]}}" : ''; |
| 235 | 235 | }, $buttons); |
| 236 | 236 | } |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | [ |
| 55 | 55 | 'attribute' => 'icon', |
| 56 | 56 | 'value' => function($model) { |
| 57 | - return Html::icon($model->icon); |
|
| 57 | + return Html::icon($model->icon); |
|
| 58 | 58 | }, |
| 59 | 59 | 'format' => 'raw' |
| 60 | 60 | ], |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | [ |
| 66 | 66 | 'class' => 'yuncms\grid\ActionColumn', |
| 67 | 67 | 'template' => '{add} {view} {update} {delete}', |
| 68 | - 'buttons' => ['add' => function ($url, $model, $key) { |
|
| 68 | + 'buttons' => ['add' => function($url, $model, $key) { |
|
| 69 | 69 | return Html::a('<span class="fa fa-plus"></span>', |
| 70 | 70 | Url::toRoute(['/admin/menu/create', 'parent' => $model->id]), [ |
| 71 | 71 | 'title' => Yii::t('yuncms', 'Add subMenu'), |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | <?php Box::begin([ |
| 22 | 22 | 'header' => Html::encode($this->title), |
| 23 | 23 | ]); ?> |
| 24 | - <?php $form = ActiveForm::begin(['layout' => 'horizontal',]); ?> |
|
| 24 | + <?php $form = ActiveForm::begin(['layout' => 'horizontal', ]); ?> |
|
| 25 | 25 | |
| 26 | 26 | <?= $form->field($model, 'baseUrl') ?> |
| 27 | 27 | <div class="hr-line-dashed"></div> |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | unset($rules[RouteRule::RULE_NAME]); |
| 16 | 16 | ?> |
| 17 | 17 | |
| 18 | -<?php $form = ActiveForm::begin(['layout' => 'horizontal',]); ?> |
|
| 18 | +<?php $form = ActiveForm::begin(['layout' => 'horizontal', ]); ?> |
|
| 19 | 19 | <?= $form->field($model, 'name')->textInput(['maxlength' => 64]) ?> |
| 20 | 20 | <div class="hr-line-dashed"></div> |
| 21 | 21 | <?= $form->field($model, 'description')->textarea(['rows' => 2]) ?> |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | 'range' => static::find()->select(['name'])->column(), |
| 64 | 64 | 'message' => 'Menu "{value}" not found.'], |
| 65 | 65 | [['parent', 'route', 'icon', 'data', 'sort'], 'default'], |
| 66 | - [['parent'], 'filterParent', 'when' => function () { |
|
| 66 | + [['parent'], 'filterParent', 'when' => function() { |
|
| 67 | 67 | return !$this->isNewRecord; |
| 68 | 68 | }], |
| 69 | 69 | [['sort'], 'integer'], |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | [ |
| 76 | 76 | 'first' => [ |
| 77 | 77 | 'icon' => 'triangle-top', |
| 78 | - 'visible' => function ($model) { |
|
| 78 | + 'visible' => function($model) { |
|
| 79 | 79 | /* @var $model \yii\db\BaseActiveRecord */ |
| 80 | 80 | if ($this->attribute !== null && isset($model[$this->attribute])) { |
| 81 | 81 | return $model[$this->attribute] > 1; |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | ], |
| 91 | 91 | 'last' => [ |
| 92 | 92 | 'icon' => 'triangle-bottom', |
| 93 | - 'visible' => function ($model) { |
|
| 93 | + 'visible' => function($model) { |
|
| 94 | 94 | /* @var $model \yii\db\BaseActiveRecord */ |
| 95 | 95 | if ($this->attribute !== null && isset($model[$this->attribute])) { |
| 96 | 96 | return $model[$this->attribute] < $this->grid->dataProvider->getTotalCount(); |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | ], |
| 106 | 106 | 'prev' => [ |
| 107 | 107 | 'icon' => 'arrow-up', |
| 108 | - 'visible' => function ($model) { |
|
| 108 | + 'visible' => function($model) { |
|
| 109 | 109 | /* @var $model \yii\db\BaseActiveRecord */ |
| 110 | 110 | if ($this->attribute !== null && isset($model[$this->attribute])) { |
| 111 | 111 | return $model[$this->attribute] > 1; |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | ], |
| 121 | 121 | 'next' => [ |
| 122 | 122 | 'icon' => 'arrow-down', |
| 123 | - 'visible' => function ($model) { |
|
| 123 | + 'visible' => function($model) { |
|
| 124 | 124 | /* @var $model \yii\db\BaseActiveRecord */ |
| 125 | 125 | if ($this->attribute !== null && isset($model[$this->attribute])) { |
| 126 | 126 | return $model[$this->attribute] < $this->grid->dataProvider->getTotalCount(); |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | protected function renderDataCellContent($model, $key, $index) |
| 145 | 145 | { |
| 146 | 146 | if ($this->content === null) { |
| 147 | - return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function ($matches) use ($model, $key, $index) { |
|
| 147 | + return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function($matches) use ($model, $key, $index) { |
|
| 148 | 148 | $name = $matches[1]; |
| 149 | 149 | if ($name === 'value') { |
| 150 | 150 | return $this->grid->formatter->format($this->getDataCellValue($model, $key, $index), $this->format); |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | } else { |
| 243 | 243 | $params = array_merge( |
| 244 | 244 | Yii::$app->getRequest()->getQueryParams(), |
| 245 | - is_array($key) ? $key : ['id' => (string) $key] |
|
| 245 | + is_array($key) ? $key : ['id' => (string)$key] |
|
| 246 | 246 | ); |
| 247 | 247 | $params[$this->positionParam] = $position; |
| 248 | 248 | $params[0] = $this->route; |