@@ -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; ?> |
@@ -81,12 +81,12 @@ discard block |
||
81 | 81 | "preContent" => "Механизм перемещения раздела. Укажите новый родительский раздел. <p><b>Внимание!</b> перемещение раздела, повлияет на изменение адресов всех дочерних разделов.</p>", |
82 | 82 | "successMessage" => "Раздел успешно перемещен", |
83 | 83 | |
84 | - 'on initFormModels' => function (Event $e) { |
|
84 | + 'on initFormModels' => function(Event $e) { |
|
85 | 85 | $model = $e->sender->model; |
86 | 86 | $dm = new DynamicModel(['pid']); |
87 | 87 | $dm->addRule(['pid'], 'integer'); |
88 | 88 | |
89 | - $dm->addRule(['pid'], function ($attribute) use ($dm, $model) { |
|
89 | + $dm->addRule(['pid'], function($attribute) use ($dm, $model) { |
|
90 | 90 | if ($dm->pid == $model->id) { |
91 | 91 | $dm->addError($attribute, \Yii::t('skeeks/cms', 'Нельзя переместить в этот раздел.')); |
92 | 92 | return false; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | $newParent = CmsTree::findOne($dm->pid); |
96 | 96 | if ($newParent->getChildren()->andWhere(['code' => $model->code])->one()) { |
97 | - $dm->addError($attribute, \Yii::t('skeeks/cms', 'Нельзя переместить в этот раздел, потому что в этом разделе есть подразделы с кодом: '.$model->code)); |
|
97 | + $dm->addError($attribute, \Yii::t('skeeks/cms', 'Нельзя переместить в этот раздел, потому что в этом разделе есть подразделы с кодом: ' . $model->code)); |
|
98 | 98 | return false; |
99 | 99 | } |
100 | 100 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | $e->sender->formModels['dm'] = $dm; |
105 | 105 | }, |
106 | 106 | |
107 | - 'on beforeSave' => function (Event $e) { |
|
107 | + 'on beforeSave' => function(Event $e) { |
|
108 | 108 | /** |
109 | 109 | * @var $action BackendModelUpdateAction; |
110 | 110 | * @var $model CmsTree; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | |
134 | 134 | }, |
135 | 135 | |
136 | - 'fields' => function ($action) { |
|
136 | + 'fields' => function($action) { |
|
137 | 137 | /** |
138 | 138 | * @var $action BackendModelUpdateAction; |
139 | 139 | * @var $model CmsTree; |
@@ -240,14 +240,14 @@ discard block |
||
240 | 240 | public function indexAction() |
241 | 241 | { |
242 | 242 | if ($root_id = \Yii::$app->request->get('root_id')) { |
243 | - $query = CmsTree::find()->where([CmsTree::tableName().'.id' => $root_id]); |
|
243 | + $query = CmsTree::find()->where([CmsTree::tableName() . '.id' => $root_id]); |
|
244 | 244 | } else { |
245 | 245 | $query = CmsTree::findRoots(); |
246 | 246 | } |
247 | 247 | |
248 | 248 | $models = $query |
249 | 249 | ->joinWith('cmsSiteRelation') |
250 | - ->orderBy([CmsSite::tableName().".priority" => SORT_ASC]) |
|
250 | + ->orderBy([CmsSite::tableName() . ".priority" => SORT_ASC]) |
|
251 | 251 | ->all(); |
252 | 252 | |
253 | 253 | return $this->render($this->action->id, ['models' => $models]); |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | [ |
273 | 273 | 'tree_id', |
274 | 274 | 'default', |
275 | - 'value' => function () { |
|
275 | + 'value' => function() { |
|
276 | 276 | if ($this->cmsContent->defaultTree) { |
277 | 277 | return $this->cmsContent->defaultTree->id; |
278 | 278 | } |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | [ |
316 | 316 | 'parent_content_element_id', |
317 | 317 | 'required', |
318 | - 'when' => function (CmsContentElement $model) { |
|
318 | + 'when' => function(CmsContentElement $model) { |
|
319 | 319 | |
320 | 320 | if ($model->cmsContent && $model->cmsContent->parentContent) { |
321 | 321 | return (bool)($model->cmsContent->parent_content_is_required == "Y"); |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | */ |
535 | 535 | public function getPermissionName() |
536 | 536 | { |
537 | - return 'cms/cms-content-element__'.$this->id; |
|
537 | + return 'cms/cms-content-element__' . $this->id; |
|
538 | 538 | } |
539 | 539 | |
540 | 540 |