@@ -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 | }  | 
                                                        
@@ -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 | },  | 
                                                        
@@ -11,7 +11,8 @@ discard block  | 
                                                    ||
| 11 | 11 | |
| 12 | 12 | <p>Empty.</p>  | 
                                                        
| 13 | 13 | |
| 14 | -<?php else: ?>  | 
                                                        |
| 14 | +<?php else { | 
                                                        |
| 15 | + : ?>  | 
                                                        |
| 15 | 16 | |
| 16 | 17 | <table class="table table-condensed table-bordered table-striped table-hover sx-table" style="table-layout: fixed;">  | 
                                                        
| 17 | 18 | <thead>  | 
                                                        
@@ -26,7 +27,9 @@ discard block  | 
                                                    ||
| 26 | 27 | <th><?= Html::encode($name) ?></th>  | 
                                                        
| 27 | 28 | <td style="overflow:auto"><?= $value ?></td>  | 
                                                        
| 28 | 29 | </tr>  | 
                                                        
| 29 | - <?php endforeach; ?>  | 
                                                        |
| 30 | + <?php endforeach;  | 
                                                        |
| 31 | +}  | 
                                                        |
| 32 | +?>  | 
                                                        |
| 30 | 33 | </tbody>  | 
                                                        
| 31 | 34 | </table>  | 
                                                        
| 32 | 35 | |
@@ -28,7 +28,7 @@ discard block  | 
                                                    ||
| 28 | 28 | 'label',  | 
                                                        
| 29 | 29 | [  | 
                                                        
| 30 | 30 | 'class' => \yii\grid\DataColumn::className(),  | 
                                                        
| 31 | -                    'value' => function ($data) { | 
                                                        |
| 31 | +                    'value' => function($data) { | 
                                                        |
| 32 | 32 | /**  | 
                                                        
| 33 | 33 | * @var $dir \skeeks\sx\Dir  | 
                                                        
| 34 | 34 | */  | 
                                                        
@@ -39,7 +39,7 @@ discard block  | 
                                                    ||
| 39 | 39 | |
| 40 | 40 | [  | 
                                                        
| 41 | 41 | 'class' => \yii\grid\DataColumn::className(),  | 
                                                        
| 42 | -                    'value' => function ($data) { | 
                                                        |
| 42 | +                    'value' => function($data) { | 
                                                        |
| 43 | 43 | /**  | 
                                                        
| 44 | 44 | * @var $dir \skeeks\sx\Dir  | 
                                                        
| 45 | 45 | */  |