@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | $form->begin('Карта миграции'); |
5 | 5 | function drawPath($path, $form, $models, $objects) |
6 | 6 | { |
7 | - $form->input('select', 'type[' . $path->id . ']', $path->item, [ |
|
7 | + $form->input('select', 'type['.$path->id.']', $path->item, [ |
|
8 | 8 | 'values' => [ |
9 | 9 | '' => 'Выберите', |
10 | 10 | 'continue' => 'Пропустить', |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | 'object' => [ |
13 | 13 | 'text' => 'Объект', |
14 | 14 | 'input' => [ |
15 | - 'name' => 'typeOptions[' . $path->id . ']', |
|
15 | + 'name' => 'typeOptions['.$path->id.']', |
|
16 | 16 | 'type' => 'select', |
17 | 17 | 'source' => 'array', |
18 | 18 | 'sourceArray' => $models |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | if (empty($objectsCols[$param->object_id])) { |
50 | 50 | $modelName = $param->object->model; |
51 | 51 | foreach (array_keys($modelName::$cols) as $colName) { |
52 | - $objectsCols[$param->object_id][$colName] = !empty($modelName::$labels[$colName])?$modelName::$labels[$colName]:$colName; |
|
52 | + $objectsCols[$param->object_id][$colName] = !empty($modelName::$labels[$colName]) ? $modelName::$labels[$colName] : $colName; |
|
53 | 53 | } |
54 | 54 | } |
55 | 55 | $modelName = $param->object->model; |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $relations[$relName] = $relName; |
59 | 59 | } |
60 | 60 | if ($parent) { |
61 | - $parserName = '\Migrations\Parser\Object\\' . ucfirst($parent->type); |
|
61 | + $parserName = '\Migrations\Parser\Object\\'.ucfirst($parent->type); |
|
62 | 62 | $parser = new $parserName; |
63 | 63 | $parser->param = $parent; |
64 | 64 | $values = $parser->editor(); |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | 'value' => [ |
73 | 73 | 'text' => 'Значение', |
74 | 74 | 'input' => [ |
75 | - 'name' => 'paramOptions[' . $param->id . ']', |
|
75 | + 'name' => 'paramOptions['.$param->id.']', |
|
76 | 76 | 'type' => 'select', |
77 | 77 | 'source' => 'array', |
78 | 78 | 'sourceArray' => $objectsCols[$param->object_id], |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | 'relation' => [ |
85 | 85 | 'text' => 'Зависимость', |
86 | 86 | 'input' => [ |
87 | - 'name' => 'paramOptions[' . $param->id . ']', |
|
87 | + 'name' => 'paramOptions['.$param->id.']', |
|
88 | 88 | 'type' => 'select', |
89 | 89 | 'source' => 'array', |
90 | 90 | 'sourceArray' => $relations, |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | 'object' => [ |
97 | 97 | 'text' => 'Объект', |
98 | 98 | 'input' => [ |
99 | - 'name' => 'paramOptions[' . $param->id . ']', |
|
99 | + 'name' => 'paramOptions['.$param->id.']', |
|
100 | 100 | 'type' => 'select', |
101 | 101 | 'source' => 'array', |
102 | 102 | 'sourceArray' => $selectArrays[$param->object->migration_id], |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | 'objectLink' => [ |
109 | 109 | 'text' => 'Ссылка на объект', |
110 | 110 | 'input' => [ |
111 | - 'name' => 'paramOptions[' . $param->id . ']', |
|
111 | + 'name' => 'paramOptions['.$param->id.']', |
|
112 | 112 | 'type' => 'select', |
113 | 113 | 'source' => 'array', |
114 | 114 | 'sourceArray' => $selectArrays[$param->object->migration_id], |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | 'newObject' => [ |
121 | 121 | 'text' => 'Новый объект', |
122 | 122 | 'input' => [ |
123 | - 'name' => 'paramOptions[' . $param->id . ']', |
|
123 | + 'name' => 'paramOptions['.$param->id.']', |
|
124 | 124 | 'type' => 'select', |
125 | 125 | 'source' => 'array', |
126 | 126 | 'sourceArray' => $models, |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | 'custom' => [ |
133 | 133 | 'text' => 'Свой класс обработки', |
134 | 134 | 'input' => [ |
135 | - 'name' => 'paramOptions[' . $param->id . ']', |
|
135 | + 'name' => 'paramOptions['.$param->id.']', |
|
136 | 136 | 'type' => 'text', |
137 | 137 | 'options' => [ |
138 | 138 | 'value' => $param->value |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | ] |
142 | 142 | ]; |
143 | 143 | } |
144 | - $form->input('select', 'param[' . $param->id . ']', $param->code, ['values' => $values, |
|
144 | + $form->input('select', 'param['.$param->id.']', $param->code, ['values' => $values, |
|
145 | 145 | 'value' => $param->type |
146 | 146 | ]); |
147 | 147 | foreach ($param->childs as $child) { |
@@ -33,7 +33,7 @@ |
||
33 | 33 | $walker->migration = $this->migration; |
34 | 34 | $walker->map = $this->map; |
35 | 35 | $walker->data = &$this->data[$path->item]; |
36 | - $walker->curPath = $this->curPath . $path->item . '/'; |
|
36 | + $walker->curPath = $this->curPath.$path->item.'/'; |
|
37 | 37 | $walker->mapPath = $path; |
38 | 38 | $walker->mapPathParent = $this->mapPath; |
39 | 39 | $walker->migtarionLog = $this->migtarionLog; |
@@ -25,7 +25,7 @@ |
||
25 | 25 | if ($param->type == 'custom') { |
26 | 26 | $parserName = $param->value; |
27 | 27 | } else { |
28 | - $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type); |
|
28 | + $parserName = '\Migrations\Parser\Object\\'.ucfirst($param->type); |
|
29 | 29 | } |
30 | 30 | if (!\Tools::isAssoc($this->data)) { |
31 | 31 | foreach ($this->data as $data) { |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return function ($step = NULL, $params = []) { |
|
3 | +return function($step = NULL, $params = []) { |
|
4 | 4 | App::$cur->db->createTable('notifications_notification', [ |
5 | 5 | 'notification_id' => 'pk', |
6 | 6 | 'notification_chanel_id' => 'int(11) UNSIGNED NOT NULL', |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | 'subscriber_device_subscriber_id' => 'int(11) UNSIGNED NOT NULL', |
30 | 30 | 'subscriber_device_date_last_check' => 'timestamp NOT NULL DEFAULT 0', |
31 | 31 | 'subscriber_device_date_create' => 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP', |
32 | - ],[ |
|
33 | - 'UNIQUE INDEX ' . App::$cur->db->table_prefix . 'notifications_subscriber_device_subscriber_device_key (subscriber_device_key)' |
|
32 | + ], [ |
|
33 | + 'UNIQUE INDEX '.App::$cur->db->table_prefix.'notifications_subscriber_device_subscriber_device_key (subscriber_device_key)' |
|
34 | 34 | ]); |
35 | 35 | App::$cur->db->createTable('notifications_subscribe', [ |
36 | 36 | 'subscribe_id' => 'pk', |
@@ -16,9 +16,9 @@ |
||
16 | 16 | $app = new App(); |
17 | 17 | $app->name = $appOptions->name; |
18 | 18 | $app->system = true; |
19 | - $app->staticPath = "/" . $appOptions->dir . "/static"; |
|
20 | - $app->templatesPath = "/" . $appOptions->dir . "/static/templates"; |
|
21 | - $app->path = INJI_PROGRAM_DIR . '/' . $appOptions->dir; |
|
19 | + $app->staticPath = "/".$appOptions->dir."/static"; |
|
20 | + $app->templatesPath = "/".$appOptions->dir."/static/templates"; |
|
21 | + $app->path = INJI_PROGRAM_DIR.'/'.$appOptions->dir; |
|
22 | 22 | $app->type = 'app'; |
23 | 23 | $app->installed = true; |
24 | 24 | $app->params = []; |
@@ -58,7 +58,7 @@ |
||
58 | 58 | foreach ($inputs[$inputName]['cols'] as $col) { |
59 | 59 | $part = trim($part); |
60 | 60 | if ($part && strlen($part) > 2) { |
61 | - $colWhere[] = [$col, '%' . $part . '%', 'LIKE', $first ? 'AND' : 'OR']; |
|
61 | + $colWhere[] = [$col, '%'.$part.'%', 'LIKE', $first ? 'AND' : 'OR']; |
|
62 | 62 | $first = false; |
63 | 63 | } |
64 | 64 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | echo '<td>'; |
35 | 35 | $col['options']['noContainer'] = true; |
36 | 36 | $col['options']['value'] = $row[$colName]; |
37 | - $form->input($col['type'], $name . '[' . ($i) . '][' . $colName . ']', false, $col['options']); |
|
37 | + $form->input($col['type'], $name.'['.($i).']['.$colName.']', false, $col['options']); |
|
38 | 38 | echo '</td>'; |
39 | 39 | } |
40 | 40 | echo '<td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>'; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | foreach ($options['cols'] as $colName => $col) { |
64 | 64 | echo '<td>'; |
65 | 65 | $col['options']['noContainer'] = true; |
66 | - $form->input($col['type'], $name . '[counterPlaceholder][' . $colName . ']', false, $col['options']); |
|
66 | + $form->input($col['type'], $name.'[counterPlaceholder]['.$colName.']', false, $col['options']); |
|
67 | 67 | echo '</td>'; |
68 | 68 | } |
69 | 69 | ?> |
@@ -13,7 +13,7 @@ |
||
13 | 13 | } else { |
14 | 14 | $dataManager = new \Ui\DataManager($options['relation']['type'] == 'relModel' ? $options['relation']['relModel'] : $options['relation']['model'], 'manager'); |
15 | 15 | $dataManager->predraw(); |
16 | - echo '<h3>' . $dataManager->table->name . '</h3>'; |
|
16 | + echo '<h3>'.$dataManager->table->name.'</h3>'; |
|
17 | 17 | echo '<h4 class=" text-muted">Чтобы добавить связи, сначала создайте объект</h4>'; |
18 | 18 | echo '<p class=" text-muted">Просто заполните доступные поля и нажмите кнопку внизу формы. После этого дополнительные поля разблокируются</p>'; |
19 | 19 | } |
@@ -1,7 +1,7 @@ |
||
1 | 1 | |
2 | 2 | <?php |
3 | 3 | echo empty($options['noContainer']) ? '<div class="form-group">' : ''; |
4 | -echo $label !== false ? "<label>{$label}" . (!empty($options['required']) ? ' <span class="required-star">*</span>' : '') . "</label>" : ''; |
|
4 | +echo $label !== false ? "<label>{$label}".(!empty($options['required']) ? ' <span class="required-star">*</span>' : '')."</label>" : ''; |
|
5 | 5 | ?> |
6 | 6 | <div class="row"> |
7 | 7 | <div class="col-xs-6"> |