Completed
Push — master ( 308a3c...ebb499 )
by Alexey
08:08
created
modules/Ui/Extensions/Access/snippets/accessGetter/Ui_DataManager.php 1 patch
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 return [
12 12
     'classes' => ['Ui\DataManager'],
13 13
     'get' => function($element) {
14
-$access = NULL;
14
+$access = null;
15 15
 $path = [
16 16
     'models',
17 17
     $element->modelName,
Please login to merge, or discard this patch.
system/modules/Ui/Controllers/UiController.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,8 @@  discard block
 block discarded – undo
16 16
             $modelName = $raw[0];
17 17
             $id = $raw[1];
18 18
             $model = $modelName::get($id, $modelName::index(), !empty($_GET['params']['dataManagerParams']) ? $_GET['params']['dataManagerParams'] : []);
19
-        } else {
19
+        }
20
+        else {
20 21
             $modelName = $_GET['item'];
21 22
             $model = new $modelName();
22 23
         }
@@ -47,7 +48,8 @@  discard block
 block discarded – undo
47 48
             $return->content = ob_get_contents();
48 49
             ob_end_clean();
49 50
             $return->send();
50
-        } else {
51
+        }
52
+        else {
51 53
             $form->checkRequest($params);
52 54
             $_GET['item'] = get_class($form->model) . ($model->pk() ? ':' . $model->pk() : '');
53 55
             $get = $_GET;
Please login to merge, or discard this patch.
system/modules/Ui/Controllers/ActiveFormController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,8 @@
 block discarded – undo
67 67
         }
68 68
         if ($searchArr) {
69 69
             $options['where'][] = $searchArr;
70
-        } else {
70
+        }
71
+        else {
71 72
             $result->content = [];
72 73
             $result->send();
73 74
         }
Please login to merge, or discard this patch.
system/modules/Ui/Controllers/DataManagerController.php 1 patch
Braces   +10 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,7 +23,8 @@  discard block
 block discarded – undo
23 23
             $raw = explode(':', $item);
24 24
             $return['modelName'] = $raw[0];
25 25
             $return['model'] = $return['modelName']::get($raw[1], $return['modelName']::index(), $return['params']);
26
-        } else {
26
+        }
27
+        else {
27 28
             $return['modelName'] = $item;
28 29
             $return['model'] = null;
29 30
         }
@@ -32,7 +33,8 @@  discard block
 block discarded – undo
32 33
             $relation = $return['modelName']::getRelation($return['params']['relation']);
33 34
             if (!empty($relation['type']) && $relation['type'] == 'relModel') {
34 35
                 $return['modelName'] = $relation['relModel'];
35
-            } else {
36
+            }
37
+            else {
36 38
                 $return['modelName'] = $relation['model'];
37 39
             }
38 40
         }
@@ -131,7 +133,8 @@  discard block
 block discarded – undo
131 133
                 }
132 134
                 echo "\n";
133 135
                 $endRow = true;
134
-            } else {
136
+            }
137
+            else {
135 138
                 Ui\Table::drawRow($row);
136 139
             }
137 140
         }
@@ -220,7 +223,8 @@  discard block
 block discarded – undo
220 223
                     $actionParams = $actions[$request['action']];
221 224
                     if (!empty($actionParams['access']['groups']) && !in_array(\Users\User::$cur->group_id, $actionParams['access']['groups'])) {
222 225
                         $result->content = 'У вас нет прав доступа к операции ' . (!isset($actionParams['name']) ? $actionParams['className']::$name : $actionParams['name']);
223
-                    } else {
226
+                    }
227
+                    else {
224 228
                         try {
225 229
                             $result->successMsg = $actionParams['className']::groupAction($dataManager, $ids, $actionParams, !empty($_GET['adInfo']) ? $_GET['adInfo'] : []);
226 230
                             $result->success = true;
@@ -230,7 +234,8 @@  discard block
 block discarded – undo
230 234
                     }
231 235
                 }
232 236
             }
233
-        } else {
237
+        }
238
+        else {
234 239
             $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
235 240
         }
236 241
         $result->send();
Please login to merge, or discard this patch.
system/modules/Ui/widgets/ActiveForm/ActiveForm.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,8 @@
 block discarded – undo
25 25
             }
26 26
             echo '</div>';
27 27
         }
28
-    } else {
28
+    }
29
+    else {
29 30
         foreach ($activeForm->form['map'] as $row) {
30 31
             foreach ($row as $col) {
31 32
                 if ($col) {
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/select.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
             $showedInput = count($aditionalInputs) - 1;
24 24
             $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
25 25
         }
26
-        $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
26
+        $optionsHtml .= "<option data-aditionalInput='" . (count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
27 27
     } else {
28 28
         $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>";
29 29
     }
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,7 +24,8 @@  discard block
 block discarded – undo
24 24
             $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
25 25
         }
26 26
         $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
27
-    } else {
27
+    }
28
+    else {
28 29
         $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>";
29 30
     }
30 31
 }
@@ -47,7 +48,8 @@  discard block
 block discarded – undo
47 48
     if ($key !== $showedInput) {
48 49
         $input['options']['disabled'] = true;
49 50
         $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'] . ' hidden' : 'hidden';
50
-    } else {
51
+    }
52
+    else {
51 53
         $input['options']['value'] = empty($input['options']['value']) ? $aditionValue : $input['options']['value'];
52 54
     }
53 55
     if ($input['type'] == 'select') {
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/dynamicList.php 3 patches
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -16,61 +16,61 @@
 block discarded – undo
16 16
                 <thead>
17 17
                     <tr>
18 18
                       <?php
19
-                      foreach ($options['cols'] as $colName => $col) {
20
-                          if (!empty($col['hidden'])) {
21
-                              continue;
22
-                          }
23
-                          echo "<th>";
24
-                          echo $col['col']['label'];
25
-                          if (!empty($col['col']['model'])) {
26
-                              $modelName = $col['col']['model'];
27
-                              $onclick = 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
28
-                                      . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;';
29
-                              echo ' (<a href="" onclick="' . $onclick . ';this.disabled=true;return false;">Создать</a>)';
30
-                          }
31
-                          echo "</th>";
32
-                      }
33
-                      ?>
19
+                        foreach ($options['cols'] as $colName => $col) {
20
+                            if (!empty($col['hidden'])) {
21
+                                continue;
22
+                            }
23
+                            echo "<th>";
24
+                            echo $col['col']['label'];
25
+                            if (!empty($col['col']['model'])) {
26
+                                $modelName = $col['col']['model'];
27
+                                $onclick = 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
28
+                                        . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this));return false;';
29
+                                echo ' (<a href="" onclick="' . $onclick . ';this.disabled=true;return false;">Создать</a>)';
30
+                            }
31
+                            echo "</th>";
32
+                        }
33
+                        ?>
34 34
                         <td>&nbsp;</td>
35 35
                     </tr>
36 36
                 </thead>
37 37
                 <tbody class="listBody">
38 38
                   <?php
39
-                  $i = 0;
40
-                  if (!empty($options['values'])) {
41
-                      foreach ($options['values'] as $row) {
42
-                          echo '<tr>';
43
-                          foreach ($options['cols'] as $colName => $col) {
44
-                              $input = clone $col['input'];
45
-                              if (empty($col['hidden'])) {
46
-                                  echo '<td>';
47
-                              }
48
-                              $input->options['noContainer'] = true;
49
-                              $input->colParams['label'] = false;
50
-                              $input->colParams['value'] = $row[$colName];
51
-                              $input->colName .= '[' . $colName . '][' . ($i) . ']';
52
-                              $input->draw();
53
-                              if (empty($col['hidden'])) {
54
-                                  echo '</td>';
55
-                              }
56
-                          }
57
-                          $i++;
58
-                          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>';
59
-                          echo '</tr>';
60
-                      }
61
-                  }
62
-                  ?>
39
+                    $i = 0;
40
+                    if (!empty($options['values'])) {
41
+                        foreach ($options['values'] as $row) {
42
+                            echo '<tr>';
43
+                            foreach ($options['cols'] as $colName => $col) {
44
+                                $input = clone $col['input'];
45
+                                if (empty($col['hidden'])) {
46
+                                    echo '<td>';
47
+                                }
48
+                                $input->options['noContainer'] = true;
49
+                                $input->colParams['label'] = false;
50
+                                $input->colParams['value'] = $row[$colName];
51
+                                $input->colName .= '[' . $colName . '][' . ($i) . ']';
52
+                                $input->draw();
53
+                                if (empty($col['hidden'])) {
54
+                                    echo '</td>';
55
+                                }
56
+                            }
57
+                            $i++;
58
+                            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>';
59
+                            echo '</tr>';
60
+                        }
61
+                    }
62
+                    ?>
63 63
                 </tbody>
64 64
                 <tfoot>
65 65
                     <tr>
66 66
                       <?php
67
-                      foreach ($options['cols'] as $colName => $col) {
68
-                          if (!empty($col['hidden'])) {
69
-                              continue;
70
-                          }
71
-                          echo "<th>{$col['col']['label']}</th>";
72
-                      }
73
-                      ?>
67
+                        foreach ($options['cols'] as $colName => $col) {
68
+                            if (!empty($col['hidden'])) {
69
+                                continue;
70
+                            }
71
+                            echo "<th>{$col['col']['label']}</th>";
72
+                        }
73
+                        ?>
74 74
                         <td>&nbsp;</td>
75 75
                     </tr>
76 76
                 </tfoot>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@
 block discarded – undo
87 87
         }
88 88
         $col['input']->options['noContainer'] = true;
89 89
         $col['input']->colParams['label'] = false;
90
-        $col['input']->colName.="[{$colName}][]";
90
+        $col['input']->colName .= "[{$colName}][]";
91 91
         $col['input']->draw();
92 92
         if (empty($col['hidden'])) {
93 93
             echo '</td>';
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,8 @@
 block discarded – undo
9 9
     if ($options['source'] == 'relation' && empty($options['modelPk'])) {
10 10
         echo '<h4 class=" text-muted">Чтобы добавить связи, сначала создайте объект</h4>';
11 11
         echo '<p class=" text-muted">Просто заполните доступные поля и нажмите кнопку внизу формы. После этого дополнительные поля разблокируются</p>';
12
-    } else {
12
+    }
13
+    else {
13 14
         ?>
14 15
         <div class="table-responsive">
15 16
             <table class ='table table-striped'>
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/search.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,10 +12,12 @@
 block discarded – undo
12 12
                     $displayValue = $calssName::{$options['inputObject']->colParams['showCol']['method']}($options['values'][$value]);
13 13
                     break;
14 14
             }
15
-        } else {
15
+        }
16
+        else {
16 17
             $displayValue = $options['values'][$value]->$options['inputObject']->colParams['showCol'];
17 18
         }
18
-    } else {
19
+    }
20
+    else {
19 21
         $displayValue = $options['values'][$value]->name();
20 22
     }
21 23
 }
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/dataManager.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,14 +10,16 @@
 block discarded – undo
10 10
             })
11 11
         </script>
12 12
         <?php
13
-    } else {
13
+    }
14
+    else {
14 15
         $dataManager = new \Ui\DataManager($options['relation']['type'] == 'relModel' ? $options['relation']['relModel'] : $options['relation']['model'], 'manager');
15 16
         $dataManager->predraw();
16 17
         echo '<h3>' . $dataManager->table->name . '</h3>';
17 18
         echo '<h4 class=" text-muted">Чтобы добавить связи, сначала создайте объект</h4>';
18 19
         echo '<p class=" text-muted">Просто заполните доступные поля и нажмите кнопку внизу формы. После этого дополнительные поля разблокируются</p>';
19 20
     }
20
-} else {
21
+}
22
+else {
21 23
     echo "<!-- class{$options['relation']['model']} none exist -->";
22 24
 }
23 25
 ?>
24 26
\ No newline at end of file
Please login to merge, or discard this patch.