@@ -110,7 +110,7 @@ |
||
110 | 110 | foreach ($relationPks as $relationPk) { |
111 | 111 | $junctionRows[] = [$model->primaryKey, $relationPk]; |
112 | 112 | } |
113 | - $model->getDb()->transaction(function () use ( |
|
113 | + $model->getDb()->transaction(function() use ( |
|
114 | 114 | $junctionTable, |
115 | 115 | $primaryModelColumn, |
116 | 116 | $relatedModelColumn, |
@@ -33,11 +33,11 @@ discard block |
||
33 | 33 | [ |
34 | 34 | 'label' => $content->name, |
35 | 35 | 'url' => ["cms/admin-cms-content-element", "content_id" => $content->id], |
36 | - "activeCallback" => function ($adminMenuItem) use ($content) { |
|
36 | + "activeCallback" => function($adminMenuItem) use ($content) { |
|
37 | 37 | return (bool)($content->id == \Yii::$app->request->get("content_id") && \Yii::$app->controller->uniqueId == 'cms/admin-cms-content-element'); |
38 | 38 | }, |
39 | 39 | |
40 | - "accessCallback" => function ($adminMenuItem) use ($content) { |
|
40 | + "accessCallback" => function($adminMenuItem) use ($content) { |
|
41 | 41 | $controller = \Yii::$app->createController('cms/admin-cms-content-element')[0]; |
42 | 42 | $controller->setContent($content); |
43 | 43 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | 'label' => $dashboard->name, |
86 | 86 | "img" => ['\skeeks\cms\assets\CmsAsset', 'images/icons/dashboard.png'], |
87 | 87 | 'url' => ["admin/index/dashboard", "pk" => $dashboard->id], |
88 | - "activeCallback" => function ($adminMenuItem) { |
|
88 | + "activeCallback" => function($adminMenuItem) { |
|
89 | 89 | return (bool)(\Yii::$app->controller->action->uniqueId == 'admin/index/dashboard' && \yii\helpers\ArrayHelper::getValue($adminMenuItem->urlData, |
90 | 90 | 'pk') == \Yii::$app->request->get('pk')); |
91 | 91 | }, |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | 'url' => ["/cms/admin-cms-content-type/update", "pk" => $contentType->id], |
125 | 125 | 'label' => $contentType->name, |
126 | 126 | "img" => ['\skeeks\cms\assets\CmsAsset', 'images/icons/icon.article.png'], |
127 | - "activeCallback" => function ($adminMenuItem) { |
|
127 | + "activeCallback" => function($adminMenuItem) { |
|
128 | 128 | return (bool)(\Yii::$app->controller->action->uniqueId == 'cms/admin-cms-content-type/update' && \yii\helpers\ArrayHelper::getValue($adminMenuItem->urlData, |
129 | 129 | 'pk') == \Yii::$app->request->get('pk')); |
130 | 130 | }, |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | [ |
137 | 137 | 'label' => $content->name, |
138 | 138 | 'url' => ["cms/admin-cms-content/update", "pk" => $content->id], |
139 | - "activeCallback" => function ($adminMenuItem) { |
|
139 | + "activeCallback" => function($adminMenuItem) { |
|
140 | 140 | return (bool)(\Yii::$app->controller->action->uniqueId == 'cms/admin-cms-content/update' && \yii\helpers\ArrayHelper::getValue($adminMenuItem->urlData, |
141 | 141 | 'pk') == \Yii::$app->request->get('pk')); |
142 | 142 | }, |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $result[] = [ |
170 | 170 | 'label' => $loadedComponent->descriptor->name, |
171 | 171 | 'url' => ["cms/admin-settings", "component" => $loadedComponent->className()], |
172 | - "activeCallback" => function ($adminMenuItem) { |
|
172 | + "activeCallback" => function($adminMenuItem) { |
|
173 | 173 | return (bool)(\Yii::$app->request->getUrl() == $adminMenuItem->getUrl()); |
174 | 174 | }, |
175 | 175 | ]; |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | //[['code'], 'string', 'max' => 64], |
138 | 138 | [ |
139 | 139 | ['code'], |
140 | - function ($attribute) { |
|
140 | + function($attribute) { |
|
141 | 141 | if (!preg_match('/^[a-zA-Z]{1}[a-zA-Z0-9]{1,255}$/', |
142 | 142 | $this->$attribute)) |
143 | 143 | //if(!preg_match('/(^|.*\])([\w\.]+)(\[.*|$)/', $this->$attribute)) |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | [ |
154 | 154 | 'code', |
155 | 155 | 'default', |
156 | - 'value' => function ($model, $attribute) { |
|
156 | + 'value' => function($model, $attribute) { |
|
157 | 157 | return "property" . StringHelper::ucfirst(md5(rand(1, 10) . time())); |
158 | 158 | } |
159 | 159 | ], |
@@ -139,13 +139,14 @@ |
||
139 | 139 | ['code'], |
140 | 140 | function ($attribute) { |
141 | 141 | if (!preg_match('/^[a-zA-Z]{1}[a-zA-Z0-9]{1,255}$/', |
142 | - $this->$attribute)) |
|
143 | - //if(!preg_match('/(^|.*\])([\w\.]+)(\[.*|$)/', $this->$attribute)) |
|
142 | + $this->$attribute)) { |
|
143 | + //if(!preg_match('/(^|.*\])([\w\.]+)(\[.*|$)/', $this->$attribute)) |
|
144 | 144 | { |
145 | 145 | $this->addError($attribute, \Yii::t('skeeks/cms', |
146 | 146 | 'Use only letters of the alphabet in lower or upper case and numbers, the first character of the letter (Example {code})', |
147 | 147 | ['code' => 'code1'])); |
148 | 148 | } |
149 | + } |
|
149 | 150 | } |
150 | 151 | ], |
151 | 152 |
@@ -10,7 +10,8 @@ discard block |
||
10 | 10 | |
11 | 11 | <?php if ($form_id = \Yii::$app->request->get('property_id')) : ?> |
12 | 12 | <?= $form->field($model, 'property_id')->hiddenInput(['value' => $form_id])->label(false); ?> |
13 | -<?php else: ?> |
|
13 | +<?php else { |
|
14 | + : ?> |
|
14 | 15 | <?= $form->field($model, 'property_id')->widget( |
15 | 16 | \skeeks\widget\chosen\Chosen::className(), [ |
16 | 17 | 'items' => \yii\helpers\ArrayHelper::map( |
@@ -19,6 +20,7 @@ discard block |
||
19 | 20 | "name" |
20 | 21 | ), |
21 | 22 | ]); |
23 | +} |
|
22 | 24 | ?> |
23 | 25 | <?php endif; ?> |
24 | 26 |
@@ -10,7 +10,8 @@ discard block |
||
10 | 10 | |
11 | 11 | <?php if ($form_id = \Yii::$app->request->get('property_id')) : ?> |
12 | 12 | <?= $form->field($model, 'property_id')->hiddenInput(['value' => $form_id])->label(false); ?> |
13 | -<?php else: ?> |
|
13 | +<?php else { |
|
14 | + : ?> |
|
14 | 15 | <?= $form->field($model, 'property_id')->widget( |
15 | 16 | \skeeks\widget\chosen\Chosen::className(), [ |
16 | 17 | 'items' => \yii\helpers\ArrayHelper::map( |
@@ -19,6 +20,7 @@ discard block |
||
19 | 20 | "name" |
20 | 21 | ), |
21 | 22 | ]); |
23 | +} |
|
22 | 24 | ?> |
23 | 25 | <?php endif; ?> |
24 | 26 |
@@ -23,9 +23,12 @@ |
||
23 | 23 | </button> |
24 | 24 | <small><?= \Yii::t('skeeks/cms', |
25 | 25 | 'The settings for this component are stored in the database. This option will erase them from the database, but the component, restore the default values. As they have in the code the developer.') ?></small> |
26 | - <?php else: ?> |
|
26 | + <?php else { |
|
27 | + : ?> |
|
27 | 28 | <small><?= \Yii::t('skeeks/cms', 'These settings not yet saved in the database') ?></small> |
28 | - <?php endif; ?> |
|
29 | + <?php endif; |
|
30 | +} |
|
31 | +?> |
|
29 | 32 | </div> |
30 | 33 | |
31 | 34 | <?php $form = \skeeks\cms\modules\admin\widgets\form\ActiveFormUseTab::begin(); ?> |
@@ -11,7 +11,8 @@ discard block |
||
11 | 11 | |
12 | 12 | <?php if (\Yii::$app->request->get('user_id')) : ?> |
13 | 13 | <?= $form->field($model, 'user_id')->hiddenInput(['value' => \Yii::$app->request->get('user_id')])->label(false) ?> |
14 | -<?php else: ?> |
|
14 | +<?php else { |
|
15 | + : ?> |
|
15 | 16 | <?= $form->fieldSelect($model, 'user_id', \yii\helpers\ArrayHelper::map( |
16 | 17 | \skeeks\cms\models\User::find()->active()->all(), |
17 | 18 | 'id', |
@@ -19,7 +20,9 @@ discard block |
||
19 | 20 | ), [ |
20 | 21 | 'allowDeselect' => true |
21 | 22 | ]) ?> |
22 | -<?php endif; ?> |
|
23 | +<?php endif; |
|
24 | +} |
|
25 | +?> |
|
23 | 26 | |
24 | 27 | |
25 | 28 | <?= $form->fieldRadioListBoolean($model, 'approved'); ?> |