Completed
Push — master ( d4133d...2ce86d )
by Alexey
04:49
created
system/modules/Ui/objects/Form.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
     {
32 32
         foreach ($data as $key => $item) {
33 33
             if (is_array($item)) {
34
-                $this->genUserDataTree($item, $treeKey ? $treeKey . "[{$key}]" : $key);
34
+                $this->genUserDataTree($item, $treeKey ? $treeKey."[{$key}]" : $key);
35 35
             } else {
36
-                $this->userDataTree[$treeKey ? $treeKey . "[{$key}]" : $key] = $item;
36
+                $this->userDataTree[$treeKey ? $treeKey."[{$key}]" : $key] = $item;
37 37
             }
38 38
         }
39 39
     }
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     {
43 43
         $params = compact('header', 'options');
44 44
         $params['form'] = $this;
45
-        \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/begin', $params);
45
+        \App::$cur->view->widget('Ui\\'.$this->options['widgetsDir'].'/begin', $params);
46 46
     }
47 47
 
48 48
     /**
@@ -65,18 +65,18 @@  discard block
 block discarded – undo
65 65
                 } else {
66 66
                     $params['options']['class'] .= ' htmleditor';
67 67
                 }
68
-                \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/textarea', $params);
68
+                \App::$cur->view->widget('Ui\\'.$this->options['widgetsDir'].'/textarea', $params);
69 69
                 break;
70 70
             case 'map':
71 71
                 $params = compact('name', 'label', 'options');
72 72
                 $params['form'] = $this;
73 73
                 \App::$cur->libs->loadLib('yandexMap');
74
-                \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/map', $params);
74
+                \App::$cur->view->widget('Ui\\'.$this->options['widgetsDir'].'/map', $params);
75 75
                 break;
76 76
             default :
77 77
                 $params = compact('name', 'label', 'options');
78 78
                 $params['form'] = $this;
79
-                \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/' . $type, $params);
79
+                \App::$cur->view->widget('Ui\\'.$this->options['widgetsDir'].'/'.$type, $params);
80 80
         }
81 81
     }
82 82
 
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
     {
91 91
         $params = compact('btnText', 'attributs');
92 92
         $params['form'] = $this;
93
-        \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/end', $params);
93
+        \App::$cur->view->widget('Ui\\'.$this->options['widgetsDir'].'/end', $params);
94 94
     }
95 95
 
96 96
 }
Please login to merge, or discard this patch.
system/modules/Ui/objects/FastEdit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
     {
18 18
         echo "<div class = 'fastEdit' ";
19 19
         if ($object) {
20
-            echo "data-model='" . get_class($object) . "' data-col='{$col}' data-key='" . $object->pk() . "'";
20
+            echo "data-model='".get_class($object)."' data-col='{$col}' data-key='".$object->pk()."'";
21 21
         }
22 22
         echo ">";
23 23
         $value = $value !== null ? $value : ($object ? $object->$col : '');
Please login to merge, or discard this patch.
system/modules/Ui/objects/ActiveForm/Input.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
     public function validate(&$request)
103 103
     {
104 104
         if (empty($request[$this->colName]) && !empty($this->colParams['required'])) {
105
-            throw new \Exception('Вы не заполнили: ' . $this->colLabel());
105
+            throw new \Exception('Вы не заполнили: '.$this->colLabel());
106 106
         }
107 107
         //var_dump($this->colName,$this->colParams);
108 108
         //exit();
Please login to merge, or discard this patch.
system/modules/Ui/objects/ActiveForm/Input/Image.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
                 'size' => $_FILES[$this->activeForm->requestFormName]['size'][$this->modelName][$this->colName],
45 45
                 'error' => $_FILES[$this->activeForm->requestFormName]['error'][$this->modelName][$this->colName],
46 46
                     ], [
47
-                'upload_code' => 'activeForm:' . $this->activeForm->modelName . ':' . $this->activeForm->model->pk(),
47
+                'upload_code' => 'activeForm:'.$this->activeForm->modelName.':'.$this->activeForm->model->pk(),
48 48
                 'accept_group' => 'image'
49 49
             ]);
50 50
             if ($file_id) {
Please login to merge, or discard this patch.
system/modules/Ui/objects/ActiveForm/Input/Files.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
                     'size' => $_FILES[$this->activeForm->requestFormName]['size'][$this->modelName][$this->colName][$key],
26 26
                     'error' => $_FILES[$this->activeForm->requestFormName]['error'][$this->modelName][$this->colName][$key],
27 27
                         ], [
28
-                    'upload_code' => 'activeForm:' . $this->activeForm->modelName . ':' . $this->activeForm->model->pk()
28
+                    'upload_code' => 'activeForm:'.$this->activeForm->modelName.':'.$this->activeForm->model->pk()
29 29
                 ]);
30 30
             }
31 31
             $this->activeForm->model->{$this->colName} = implode(',', array_filter($file_ids));
Please login to merge, or discard this patch.
system/modules/Ui/objects/DataManager/Action/Open.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
             'formName' => !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager',
27 27
             'redirectUrl' => !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : str_replace('\\', '/', $dataManager->modelName)
28 28
         ];
29
-        return "<a href='/admin/" . str_replace('\\', '/view/', get_class($item)) . "/{$item->pk()}?" . http_build_query($query) . "'><i class='glyphicon glyphicon-eye-open'></i></a>";
29
+        return "<a href='/admin/".str_replace('\\', '/view/', get_class($item))."/{$item->pk()}?".http_build_query($query)."'><i class='glyphicon glyphicon-eye-open'></i></a>";
30 30
     }
31 31
 
32 32
 }
Please login to merge, or discard this patch.
system/modules/Ui/objects/DataManager/Action/Href.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
         if (!empty($actionParams['query'])) {
29 29
             $query = $query + $actionParams['query'];
30 30
         }
31
-        return "<a class='" . (isset($actionParams['class']) ? $actionParams['class'] : '') . "' href='{$actionParams['href']}?" . http_build_query($query) . "'>{$actionParams['text']}</a>";
31
+        return "<a class='".(isset($actionParams['class']) ? $actionParams['class'] : '')."' href='{$actionParams['href']}?".http_build_query($query)."'>{$actionParams['text']}</a>";
32 32
     }
33 33
 
34 34
 }
Please login to merge, or discard this patch.
system/modules/Ui/objects/DataManager/Action/Edit.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
             'formName' => !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager'
25 25
         ];
26 26
 
27
-        return '<a href ="#" onclick=\'inji.Ui.forms.popUp("' . addcslashes(get_class($item), '\\') . ':' . $item->pk() . '",' . json_encode($formParams) . ');
27
+        return '<a href ="#" onclick=\'inji.Ui.forms.popUp("'.addcslashes(get_class($item), '\\').':'.$item->pk().'",'.json_encode($formParams).');
28 28
                                       return false;\'><i class="glyphicon glyphicon-edit"></i></a>';
29 29
     }
30 30
 
Please login to merge, or discard this patch.
system/modules/Ui/objects/DataManager/Action/Delete.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
     public static function rowButton($dataManager, $item, $params, $actionParams)
21 21
     {
22
-        return '<a href ="#" onclick=\'inji.Ui.dataManagers.get(this).delRow(' . $item->pk() . ');
22
+        return '<a href ="#" onclick=\'inji.Ui.dataManagers.get(this).delRow('.$item->pk().');
23 23
                                       return false;\'><i class="glyphicon glyphicon-remove"></i></a>';
24 24
     }
25 25
 
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
             $model->delete();
32 32
         }
33 33
         $count = count($models);
34
-        return 'Удалено <b>' . $count . '</b> ' . \Tools::getNumEnding($count, ['запись', 'записи', 'записей']);
34
+        return 'Удалено <b>'.$count.'</b> '.\Tools::getNumEnding($count, ['запись', 'записи', 'записей']);
35 35
     }
36 36
 
37 37
 }
Please login to merge, or discard this patch.