@@ -65,14 +65,14 @@ |
||
65 | 65 | [ |
66 | 66 | 'code', |
67 | 67 | 'default', |
68 | - 'value' => function ($model, $attribute) { |
|
68 | + 'value' => function($model, $attribute) { |
|
69 | 69 | return md5(rand(1, 10) . time()); |
70 | 70 | } |
71 | 71 | ], |
72 | 72 | [ |
73 | 73 | 'priority', |
74 | 74 | 'default', |
75 | - 'value' => function ($model, $attribute) { |
|
75 | + 'value' => function($model, $attribute) { |
|
76 | 76 | return 500; |
77 | 77 | } |
78 | 78 | ], |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | [ |
69 | 69 | ['value_enum', 'value_int2'], |
70 | 70 | 'filter', |
71 | - 'filter' => function ($value) { |
|
71 | + 'filter' => function($value) { |
|
72 | 72 | $value = (int)$value; |
73 | 73 | $filter_options = [ |
74 | 74 | 'options' => [ |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | [ |
87 | 87 | ['value_num', 'value_num2'], |
88 | 88 | 'filter', |
89 | - 'filter' => function ($value) { |
|
89 | + 'filter' => function($value) { |
|
90 | 90 | $value = (float)$value; |
91 | 91 | $min_range = -1.0E+14; |
92 | 92 | $max_range = 1.0E+14; |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | [ |
104 | 104 | 'value_bool', |
105 | 105 | 'filter', |
106 | - 'filter' => function ($value) { |
|
106 | + 'filter' => function($value) { |
|
107 | 107 | $value = (bool)$value; |
108 | 108 | return $value; |
109 | 109 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | //[['code'], 'string', 'max' => 64], |
141 | 141 | [ |
142 | 142 | ['code'], |
143 | - function ($attribute) { |
|
143 | + function($attribute) { |
|
144 | 144 | if (!preg_match('/^[a-zA-Z]{1}[a-zA-Z0-9]{1,255}$/', |
145 | 145 | $this->$attribute)) //if(!preg_match('/(^|.*\])([\w\.]+)(\[.*|$)/', $this->$attribute)) |
146 | 146 | { |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | [ |
156 | 156 | 'code', |
157 | 157 | 'default', |
158 | - 'value' => function ($model, $attribute) { |
|
158 | + 'value' => function($model, $attribute) { |
|
159 | 159 | return "property" . StringHelper::ucfirst(md5(rand(1, 10) . time())); |
160 | 160 | } |
161 | 161 | ], |
@@ -142,12 +142,14 @@ |
||
142 | 142 | ['code'], |
143 | 143 | function ($attribute) { |
144 | 144 | if (!preg_match('/^[a-zA-Z]{1}[a-zA-Z0-9]{1,255}$/', |
145 | - $this->$attribute)) //if(!preg_match('/(^|.*\])([\w\.]+)(\[.*|$)/', $this->$attribute)) |
|
145 | + $this->$attribute)) { |
|
146 | + //if(!preg_match('/(^|.*\])([\w\.]+)(\[.*|$)/', $this->$attribute)) |
|
146 | 147 | { |
147 | 148 | $this->addError($attribute, \Yii::t('skeeks/cms', |
148 | 149 | 'Use only letters of the alphabet in lower or upper case and numbers, the first character of the letter (Example {code})', |
149 | 150 | ['code' => 'code1'])); |
150 | 151 | } |
152 | + } |
|
151 | 153 | } |
152 | 154 | ], |
153 | 155 |
@@ -33,9 +33,12 @@ |
||
33 | 33 | <?php if ($model->cmsContent) : ?> |
34 | 34 | <?= $form->fieldSelectMulti($model, 'realatedProperties', |
35 | 35 | \yii\helpers\ArrayHelper::map($model->cmsContent->cmsContentProperties, 'code', 'name')); ?> |
36 | -<?php else: ?> |
|
36 | +<?php else { |
|
37 | + : ?> |
|
37 | 38 | Дополнительные свойства появятся после сохранения настроек |
38 | -<?php endif; ?> |
|
39 | +<?php endif; |
|
40 | +} |
|
41 | +?> |
|
39 | 42 | |
40 | 43 | |
41 | 44 |
@@ -96,12 +96,15 @@ |
||
96 | 96 | </div> |
97 | 97 | </div> |
98 | 98 | |
99 | - <?php else : ?> |
|
99 | + <?php else { |
|
100 | + : ?> |
|
100 | 101 | |
101 | 102 | <?php $propertiesValues = \skeeks\cms\models\CmsContentElementProperty::find()->select(['value'])->where([ |
102 | 103 | 'property_id' => $property->id, |
103 | 104 | 'element_id' => $widget->elementIds |
104 | - ])->all(); ?> |
|
105 | + ])->all(); |
|
106 | +} |
|
107 | +?> |
|
105 | 108 | |
106 | 109 | <?php if ($propertiesValues) : ?> |
107 | 110 | <div class="row"> |
@@ -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'); ?> |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | |
25 | 25 | [ |
26 | 26 | 'class' => \yii\grid\DataColumn::className(), |
27 | - 'value' => function ($model, $key, $index, $widget) { |
|
27 | + 'value' => function($model, $key, $index, $widget) { |
|
28 | 28 | //return "<img src='" . $model->() . "' style='width: 100px;' />"; |
29 | 29 | }, |
30 | 30 | 'attribute' => 'image', |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | |
34 | 34 | [ |
35 | 35 | 'class' => \yii\grid\DataColumn::className(), |
36 | - 'value' => function ($model, $key, $index, $widget) { |
|
36 | + 'value' => function($model, $key, $index, $widget) { |
|
37 | 37 | return Html::a($model->getDisplayName(), $model->getPageUrl()); |
38 | 38 | }, |
39 | 39 | 'attribute' => 'name', |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | |
55 | 55 | [ |
56 | 56 | 'class' => \yii\grid\DataColumn::className(), |
57 | - 'value' => function (\skeeks\cms\models\StorageFile $model) { |
|
57 | + 'value' => function(\skeeks\cms\models\StorageFile $model) { |
|
58 | 58 | if ($model->isImage()) { |
59 | 59 | |
60 | 60 | $smallImage = \Yii::$app->imaging->getImagingUrl($model->src, |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | |
87 | 87 | [ |
88 | 88 | 'class' => \yii\grid\DataColumn::className(), |
89 | - 'value' => function (\skeeks\cms\models\StorageFile $model) { |
|
89 | + 'value' => function(\skeeks\cms\models\StorageFile $model) { |
|
90 | 90 | $model->cluster_id; |
91 | 91 | $cluster = \Yii::$app->storage->getCluster($model->cluster_id); |
92 | 92 | return $cluster->name; |
@@ -33,7 +33,7 @@ |
||
33 | 33 | 'code', |
34 | 34 | |
35 | 35 | [ |
36 | - 'value' => function (\skeeks\cms\models\CmsContentType $model) { |
|
36 | + 'value' => function(\skeeks\cms\models\CmsContentType $model) { |
|
37 | 37 | $contents = \yii\helpers\ArrayHelper::map($model->cmsContents, 'id', 'name'); |
38 | 38 | return implode(', ', $contents); |
39 | 39 | }, |