@@ -34,7 +34,7 @@ |
||
34 | 34 | |
35 | 35 | 'active' => "CHAR(1) NOT NULL DEFAULT 'Y'", |
36 | 36 | 'def' => "CHAR(1) NOT NULL DEFAULT 'N'", |
37 | - 'priority' => Schema::TYPE_INTEGER. "(11) NOT NULL DEFAULT '500'", |
|
37 | + 'priority' => Schema::TYPE_INTEGER . "(11) NOT NULL DEFAULT '500'", |
|
38 | 38 | |
39 | 39 | 'code' => "CHAR(5) NOT NULL", |
40 | 40 | 'name' => Schema::TYPE_STRING . '(255) NOT NULL', |
@@ -39,27 +39,27 @@ |
||
39 | 39 | 'created_at' => Schema::TYPE_INTEGER . ' NULL', |
40 | 40 | 'updated_at' => Schema::TYPE_INTEGER . ' NULL', |
41 | 41 | |
42 | - 'name' => Schema::TYPE_STRING. '(255) NOT NULL', |
|
43 | - 'code' => Schema::TYPE_STRING. '(50) NOT NULL', |
|
42 | + 'name' => Schema::TYPE_STRING . '(255) NOT NULL', |
|
43 | + 'code' => Schema::TYPE_STRING . '(50) NOT NULL', |
|
44 | 44 | |
45 | 45 | 'active' => "CHAR(1) NOT NULL DEFAULT 'Y'", |
46 | 46 | |
47 | - 'priority' => Schema::TYPE_INTEGER. "(11) NOT NULL DEFAULT '500'", |
|
47 | + 'priority' => Schema::TYPE_INTEGER . "(11) NOT NULL DEFAULT '500'", |
|
48 | 48 | |
49 | - 'description' => Schema::TYPE_TEXT. " NULL", |
|
49 | + 'description' => Schema::TYPE_TEXT . " NULL", |
|
50 | 50 | |
51 | - 'files' => Schema::TYPE_TEXT. ' NULL', |
|
51 | + 'files' => Schema::TYPE_TEXT . ' NULL', |
|
52 | 52 | |
53 | 53 | 'index_for_search' => "CHAR(1) NOT NULL DEFAULT 'Y'", //Индексировать элементы для модуля поиска |
54 | 54 | |
55 | - 'name_meny' => Schema::TYPE_STRING. '(100) NULL', |
|
56 | - 'name_one' => Schema::TYPE_STRING. '(100) NULL', |
|
55 | + 'name_meny' => Schema::TYPE_STRING . '(100) NULL', |
|
56 | + 'name_one' => Schema::TYPE_STRING . '(100) NULL', |
|
57 | 57 | |
58 | 58 | |
59 | 59 | 'tree_chooser' => "CHAR(1) NULL", //Интерфейс привязки элемента к разделам |
60 | 60 | 'list_mode' => "CHAR(1) NULL", //Режим просмотра разделов и элементов |
61 | 61 | |
62 | - 'content_type' => Schema::TYPE_STRING. '(32) NOT NULL', |
|
62 | + 'content_type' => Schema::TYPE_STRING . '(32) NOT NULL', |
|
63 | 63 | |
64 | 64 | ], $tableOptions); |
65 | 65 |
@@ -36,8 +36,8 @@ |
||
36 | 36 | |
37 | 37 | 'value' => Schema::TYPE_STRING . '(255) NOT NULL', |
38 | 38 | 'def' => "CHAR(1) NOT NULL DEFAULT 'N'", |
39 | - 'code' => Schema::TYPE_STRING. '(32) NOT NULL', |
|
40 | - 'priority' => Schema::TYPE_INTEGER. "(11) NOT NULL DEFAULT '500'", |
|
39 | + 'code' => Schema::TYPE_STRING . '(32) NOT NULL', |
|
40 | + 'priority' => Schema::TYPE_INTEGER . "(11) NOT NULL DEFAULT '500'", |
|
41 | 41 | |
42 | 42 | ], $tableOptions); |
43 | 43 |
@@ -51,7 +51,7 @@ |
||
51 | 51 | |
52 | 52 | 'status' => Schema::TYPE_SMALLINT . ' NOT NULL DEFAULT 10', |
53 | 53 | |
54 | - 'files' => Schema::TYPE_TEXT. ' NULL', // |
|
54 | + 'files' => Schema::TYPE_TEXT . ' NULL', // |
|
55 | 55 | |
56 | 56 | ], $tableOptions); |
57 | 57 |
@@ -36,8 +36,8 @@ |
||
36 | 36 | |
37 | 37 | 'value' => Schema::TYPE_STRING . '(255) NOT NULL', |
38 | 38 | 'def' => "CHAR(1) NOT NULL DEFAULT 'N'", |
39 | - 'code' => Schema::TYPE_STRING. '(32) NOT NULL', |
|
40 | - 'priority' => Schema::TYPE_INTEGER. "(11) NOT NULL DEFAULT '500'", |
|
39 | + 'code' => Schema::TYPE_STRING . '(32) NOT NULL', |
|
40 | + 'priority' => Schema::TYPE_INTEGER . "(11) NOT NULL DEFAULT '500'", |
|
41 | 41 | |
42 | 42 | ], $tableOptions); |
43 | 43 |
@@ -100,8 +100,8 @@ |
||
100 | 100 | * @var $element CmsContentElement |
101 | 101 | */ |
102 | 102 | foreach (CmsContentElement::find() |
103 | - //->orderBy(['id' => SORT_ASC]) |
|
104 | - ->each(10) as $element) { |
|
103 | + //->orderBy(['id' => SORT_ASC]) |
|
104 | + ->each(10) as $element) { |
|
105 | 105 | $this->stdout("\t Element: {$element->id}", Console::FG_YELLOW); |
106 | 106 | |
107 | 107 | if ($element->relatedPropertiesModel->save()) { |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | <?= $form->fieldSet(\Yii::t('skeeks/cms', 'Access')); ?> |
149 | 149 | <?= \skeeks\cms\rbac\widgets\adminPermissionForRoles\AdminPermissionForRolesWidget::widget([ |
150 | 150 | 'permissionName' => $model->permissionName, |
151 | - 'permissionDescription' => 'Доступ к этому элементу: '.$model->name, |
|
151 | + 'permissionDescription' => 'Доступ к этому элементу: ' . $model->name, |
|
152 | 152 | 'label' => 'Доступ к этому элементу', |
153 | 153 | ]); ?> |
154 | 154 | <?= $form->fieldSetEnd() ?> |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | : ?> |
180 | 180 | <?= \skeeks\cms\modules\admin\widgets\RelatedModelsGrid::widget([ |
181 | 181 | 'label' => $childContent->name, |
182 | - 'namespace' => md5($model->className().$childContent->id), |
|
182 | + 'namespace' => md5($model->className() . $childContent->id), |
|
183 | 183 | 'parentModel' => $model, |
184 | 184 | 'relation' => [ |
185 | 185 | 'content_id' => $childContent->id, |
@@ -87,9 +87,10 @@ discard block |
||
87 | 87 | <?php $model->content_id = $content_id; ?> |
88 | 88 | <?= $form->field($model, 'content_id')->hiddenInput(['value' => $content_id])->label(false); ?> |
89 | 89 | <?php endif; ?> |
90 | - <?php else |
|
90 | + <?php else { |
|
91 | 91 | : ?> |
92 | 92 | <?php $contentModel = $model->cmsContent; |
93 | +} |
|
93 | 94 | ?> |
94 | 95 | <?php endif; ?> |
95 | 96 | |
@@ -175,7 +176,7 @@ discard block |
||
175 | 176 | ], |
176 | 177 | 'body' => \Yii::t('skeeks/cms', 'Management will be available after saving'), |
177 | 178 | ]); ?> |
178 | - <?php else |
|
179 | + <?php else { |
|
179 | 180 | : ?> |
180 | 181 | <?= \skeeks\cms\modules\admin\widgets\RelatedModelsGrid::widget([ |
181 | 182 | 'label' => $childContent->name, |
@@ -198,6 +199,7 @@ discard block |
||
198 | 199 | 'columns' => (array)\skeeks\cms\controllers\AdminCmsContentElementController::getColumns($childContent), |
199 | 200 | ], |
200 | 201 | ]); |
202 | +} |
|
201 | 203 | ?> |
202 | 204 | |
203 | 205 | <?php endif; ?> |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | [ |
91 | 91 | 'class' => \yii\grid\DataColumn::class, |
92 | - 'value' => function (\skeeks\cms\models\CmsContentElement $model) { |
|
92 | + 'value' => function(\skeeks\cms\models\CmsContentElement $model) { |
|
93 | 93 | if (!$model->cmsTree) { |
94 | 94 | return null; |
95 | 95 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | if ($model->cmsTree->parents) { |
100 | 100 | foreach ($model->cmsTree->parents as $parent) { |
101 | 101 | if ($parent->isRoot()) { |
102 | - $path[] = "[".$parent->site->name."] ".$parent->name; |
|
102 | + $path[] = "[" . $parent->site->name . "] " . $parent->name; |
|
103 | 103 | } else { |
104 | 104 | $path[] = $parent->name; |
105 | 105 | } |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | |
117 | 117 | 'additionalSections' => [ |
118 | 118 | 'class' => \yii\grid\DataColumn::class, |
119 | - 'value' => function (\skeeks\cms\models\CmsContentElement $model) { |
|
119 | + 'value' => function(\skeeks\cms\models\CmsContentElement $model) { |
|
120 | 120 | $result = []; |
121 | 121 | |
122 | 122 | if ($model->cmsContentElementTrees) { |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | [ |
145 | 145 | 'class' => \yii\grid\DataColumn::class, |
146 | 146 | 'label' => "Смотреть", |
147 | - 'value' => function (\skeeks\cms\models\CmsContentElement $model) { |
|
147 | + 'value' => function(\skeeks\cms\models\CmsContentElement $model) { |
|
148 | 148 | |
149 | 149 | return \yii\helpers\Html::a('<i class="glyphicon glyphicon-arrow-right"></i>', $model->absoluteUrl, |
150 | 150 | [ |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | 'visible' => false, |
191 | 191 | 'format' => 'raw', |
192 | 192 | 'class' => \yii\grid\DataColumn::class, |
193 | - 'value' => function ($model, $key, $index) use ($name) { |
|
193 | + 'value' => function($model, $key, $index) use ($name) { |
|
194 | 194 | if (is_array($model->{$name})) { |
195 | 195 | return implode(",", $model->{$name}); |
196 | 196 | } else { |
@@ -505,7 +505,7 @@ discard block |
||
505 | 505 | foreach ((array)ArrayHelper::getValue($formData, 'fields') as $code) { |
506 | 506 | if ($rpForSave->hasAttribute($code)) { |
507 | 507 | $rpForSave->setAttribute($code, |
508 | - ArrayHelper::getValue($formData, 'RelatedPropertiesModel.'.$code)); |
|
508 | + ArrayHelper::getValue($formData, 'RelatedPropertiesModel.' . $code)); |
|
509 | 509 | } |
510 | 510 | } |
511 | 511 | |
@@ -549,7 +549,7 @@ discard block |
||
549 | 549 | $unique = parent::getPermissionName(); |
550 | 550 | |
551 | 551 | if ($this->content) { |
552 | - $unique = $unique."__".$this->content->id; |
|
552 | + $unique = $unique . "__" . $this->content->id; |
|
553 | 553 | } |
554 | 554 | |
555 | 555 | return $unique; |
@@ -575,7 +575,7 @@ discard block |
||
575 | 575 | ], |
576 | 576 | ]); |
577 | 577 | |
578 | - $this->_content = CmsContent::getDb()->cache(function ($db) use ($content_id) { |
|
578 | + $this->_content = CmsContent::getDb()->cache(function($db) use ($content_id) { |
|
579 | 579 | return CmsContent::find()->where([ |
580 | 580 | "id" => $content_id, |
581 | 581 | ])->one(); |