Completed
Push — master ( 71170f...1d826a )
by Alexey
06:07
created
system/modules/Sliders/widgets/slider.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
         ?>
33 33
         <div class="item <?= !$i ? 'active' : ''; ?>">
34 34
           <?php
35
-          if ($item->link) {
36
-              echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
37
-          }
38
-          ?>
35
+            if ($item->link) {
36
+                echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
37
+            }
38
+            ?>
39 39
           <img src="<?= Statics::file($item->image->path); ?>" alt="<?= $item->name; ?>">
40 40
           <div class="carousel-caption">
41 41
             <?= $item->description; ?>
42 42
           </div>
43 43
           <?php
44
-          if ($item->link) {
45
-              echo "</a>";
46
-          }
47
-          ?>
44
+            if ($item->link) {
45
+                echo "</a>";
46
+            }
47
+            ?>
48 48
         </div>
49 49
         <?php
50 50
         $i++;
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
   </div>
54 54
 
55 55
   <?php
56
-  if (!isset($arrows) || $arrows) {
57
-      ?>
56
+    if (!isset($arrows) || $arrows) {
57
+        ?>
58 58
       <!-- Controls -->
59 59
       <a class="left carousel-control" href="#sliderWidget-<?= $slider->id; ?>" role="button" data-slide="prev">
60 60
         <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
@@ -65,6 +65,6 @@  discard block
 block discarded – undo
65 65
         <span class="sr-only">Next</span>
66 66
       </a>
67 67
       <?php
68
-  }
69
-  ?>
68
+    }
69
+    ?>
70 70
 </div>
71 71
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ui/widgets/DataManager/categorys.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,6 +9,6 @@
 block discarded – undo
9 9
 <a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='<?= $model::index(); ?>' data-path ='/' data-id='0'> Корень</a>
10 10
 <div class="categoryTree">
11 11
   <?php
12
-  $dataManager->drawCategorys();
13
-  ?>
12
+    $dataManager->drawCategorys();
13
+    ?>
14 14
 </div>
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Widgets/appAdminControllers/content/widgetChooser.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@
 block discarded – undo
29 29
 <select class ='form-control' id = 'widgetChooser' onchange="selectChange(this);">
30 30
   <option value = ''>Выберите виджет</option>
31 31
   <?php
32
-  foreach ($widgets as $code => $options) {
33
-      $name = is_string($options) ? $options : $options['name'];
34
-      echo "<option value = '{$code}' data-filename='{$code}'>{$name}</option>";
35
-  }
36
-  ?>
32
+    foreach ($widgets as $code => $options) {
33
+        $name = is_string($options) ? $options : $options['name'];
34
+        echo "<option value = '{$code}' data-filename='{$code}'>{$name}</option>";
35
+    }
36
+    ?>
37 37
 </select>
38 38
 <?php
39 39
 foreach ($widgets as $code => $options) {
Please login to merge, or discard this patch.
system/modules/Ecommerce/appControllers/content/Cart/orderDetail.php 1 patch
Indentation   +87 added lines, -87 removed lines patch added patch discarded remove patch
@@ -8,11 +8,11 @@  discard block
 block discarded – undo
8 8
         </tr>
9 9
       </thead>
10 10
       <?php
11
-      $orderDeatilCols = [
12
-          'id' => '№ Заказа',
13
-          'complete_data' => 'Дата заказа'
14
-      ];
15
-      ?>
11
+        $orderDeatilCols = [
12
+            'id' => '№ Заказа',
13
+            'complete_data' => 'Дата заказа'
14
+        ];
15
+        ?>
16 16
       <tbody>
17 17
         <tr>
18 18
           <td class="text-left" style="width: 50%;">              
@@ -65,91 +65,91 @@  discard block
 block discarded – undo
65 65
         </thead>
66 66
         <tbody>
67 67
           <?php
68
-          $sums = [];
69
-          foreach ($cart->cartItems as $cartItem) {
70
-              $item = $cartItem->item;
71
-              $itemName = $item->name();
72
-              if (!isset($sums[$cartItem->price->currency_id])) {
73
-                  $sums[$cartItem->price->currency_id] = $cartItem->price->price;
74
-              } else {
75
-                  $sums[$cartItem->price->currency_id] += $cartItem->price->price;
76
-              }
77
-              ?>
68
+            $sums = [];
69
+            foreach ($cart->cartItems as $cartItem) {
70
+                $item = $cartItem->item;
71
+                $itemName = $item->name();
72
+                if (!isset($sums[$cartItem->price->currency_id])) {
73
+                    $sums[$cartItem->price->currency_id] = $cartItem->price->price;
74
+                } else {
75
+                    $sums[$cartItem->price->currency_id] += $cartItem->price->price;
76
+                }
77
+                ?>
78 78
               <tr>
79 79
                 <td class="text-left"><?= $itemName; ?></td>
80 80
                 <td class="text-right"><?= $cartItem->count; ?></td>
81 81
                 <td class="text-right"><?= $cartItem->price->price; ?> 
82 82
                   <?php
83
-                  if (App::$cur->money) {
84
-                      $currency = Money\Currency::get($cartItem->price->currency_id);
85
-                      if ($currency) {
86
-                          echo $currency->acronym();
87
-                      } else {
88
-                          echo 'руб.';
89
-                      }
90
-                  } else {
91
-                      echo 'руб.';
92
-                  }
93
-                  ?></td>
83
+                    if (App::$cur->money) {
84
+                        $currency = Money\Currency::get($cartItem->price->currency_id);
85
+                        if ($currency) {
86
+                            echo $currency->acronym();
87
+                        } else {
88
+                            echo 'руб.';
89
+                        }
90
+                    } else {
91
+                        echo 'руб.';
92
+                    }
93
+                    ?></td>
94 94
                 <td class="text-right"><?= ($cartItem->price->price * $cartItem->count); ?>
95 95
                   <?php
96
-                  if (App::$cur->money) {
97
-                      $currency = Money\Currency::get($cartItem->price->currency_id);
98
-                      if ($currency) {
99
-                          echo $currency->acronym();
100
-                      } else {
101
-                          echo 'руб.';
102
-                      }
103
-                  } else {
104
-                      echo 'руб.';
105
-                  }
106
-                  ?></td>
96
+                    if (App::$cur->money) {
97
+                        $currency = Money\Currency::get($cartItem->price->currency_id);
98
+                        if ($currency) {
99
+                            echo $currency->acronym();
100
+                        } else {
101
+                            echo 'руб.';
102
+                        }
103
+                    } else {
104
+                        echo 'руб.';
105
+                    }
106
+                    ?></td>
107 107
                 <td class="text-right" style="white-space: nowrap;">
108 108
                   <a onclick = 'inji.Ecommerce.Cart.addItem(<?= $item->getPrice()->id; ?>, 1);
109 109
                           return false;' data-original-title="Добавить в корзину" href="#" data-toggle="tooltip" title="" class="btn btn-primary"><i class="glyphicon glyphicon-shopping-cart"></i></a>
110 110
               </tr>
111 111
               <?php
112
-          }
113
-          ?>
112
+            }
113
+            ?>
114 114
         </tbody>
115 115
         <tfoot>
116 116
           <tr>
117 117
             <td colspan="2"></td>
118 118
             <td class="text-right"><b>Сумма</b></td>
119 119
             <td class="text-right"><?php
120
-              foreach ($sums as $currency_id => $sum) {
121
-                  if (!$sum) {
122
-                      continue;
123
-                  }
124
-                  echo number_format($sum, 2, '.', ' ');
125
-                  if (App::$cur->money) {
126
-                      $currency = Money\Currency::get($currency_id);
127
-                      if ($currency) {
128
-                          echo '&nbsp;' . $currency->acronym();
129
-                      } else {
130
-                          echo '&nbsp;руб.';
131
-                      }
132
-                  } else {
133
-                      echo '&nbsp;руб.';
134
-                  }
135
-                  echo '<br />';
136
-              }
137
-              ?></td>
120
+                foreach ($sums as $currency_id => $sum) {
121
+                    if (!$sum) {
122
+                        continue;
123
+                    }
124
+                    echo number_format($sum, 2, '.', ' ');
125
+                    if (App::$cur->money) {
126
+                        $currency = Money\Currency::get($currency_id);
127
+                        if ($currency) {
128
+                            echo '&nbsp;' . $currency->acronym();
129
+                        } else {
130
+                            echo '&nbsp;руб.';
131
+                        }
132
+                    } else {
133
+                        echo '&nbsp;руб.';
134
+                    }
135
+                    echo '<br />';
136
+                }
137
+                ?></td>
138 138
             <td></td>
139 139
           </tr>
140 140
           <?php
141
-          $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
142
-          $deliveryPrice = $cart->delivery->price;
143
-          if (!isset($sums[$deliveryCurrency])) {
144
-              $sums[$deliveryCurrency] = $deliveryPrice;
145
-          } else {
146
-              $sums[$deliveryCurrency] += $deliveryPrice;
147
-          }
148
-          $delCurrency = false;
149
-          if (App::$cur->money) {
150
-              $delCurrency = Money\Currency::get($deliveryPrice);
151
-          }
152
-          ?>
141
+            $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
142
+            $deliveryPrice = $cart->delivery->price;
143
+            if (!isset($sums[$deliveryCurrency])) {
144
+                $sums[$deliveryCurrency] = $deliveryPrice;
145
+            } else {
146
+                $sums[$deliveryCurrency] += $deliveryPrice;
147
+            }
148
+            $delCurrency = false;
149
+            if (App::$cur->money) {
150
+                $delCurrency = Money\Currency::get($deliveryPrice);
151
+            }
152
+            ?>
153 153
           <tr>
154 154
             <td colspan="2"></td>
155 155
             <td class="text-right"><b><?= $cart->delivery ? $cart->delivery->name : 'Доставка'; ?></b></td>
@@ -160,24 +160,24 @@  discard block
 block discarded – undo
160 160
             <td colspan="2"></td>
161 161
             <td class="text-right"><b>Итого</b></td>
162 162
             <td class="text-right"><?php
163
-              foreach ($sums as $currency_id => $sum) {
164
-                  if (!$sum) {
165
-                      continue;
166
-                  }
167
-                  echo number_format($sum, 2, '.', ' ');
168
-                  if (App::$cur->money) {
169
-                      $currency = Money\Currency::get($currency_id);
170
-                      if ($currency) {
171
-                          echo '&nbsp;' . $currency->acronym();
172
-                      } else {
173
-                          echo '&nbsp;руб.';
174
-                      }
175
-                  } else {
176
-                      echo '&nbsp;руб.';
177
-                  }
178
-                  echo '<br />';
179
-              }
180
-              ?></td>
163
+                foreach ($sums as $currency_id => $sum) {
164
+                    if (!$sum) {
165
+                        continue;
166
+                    }
167
+                    echo number_format($sum, 2, '.', ' ');
168
+                    if (App::$cur->money) {
169
+                        $currency = Money\Currency::get($currency_id);
170
+                        if ($currency) {
171
+                            echo '&nbsp;' . $currency->acronym();
172
+                        } else {
173
+                            echo '&nbsp;руб.';
174
+                        }
175
+                    } else {
176
+                        echo '&nbsp;руб.';
177
+                    }
178
+                    echo '<br />';
179
+                }
180
+                ?></td>
181 181
             <td></td>
182 182
           </tr>
183 183
         </tfoot>
Please login to merge, or discard this patch.
system/modules/Migrations/objects/Parser/Object/Value.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -13,85 +13,85 @@
 block discarded – undo
13 13
 
14 14
 class Value extends \Migrations\Parser {
15 15
 
16
-  public function parse() {
16
+    public function parse() {
17 17
     $options = $this->param->options ? json_decode($this->param->options, true) : [];
18 18
     $modelName = get_class($this->model);
19 19
     $cols = $modelName::$cols;
20 20
     $value = $this->data;
21 21
     if (is_array($value)) {
22
-      $value = '';
22
+        $value = '';
23 23
     }
24 24
     if (!empty($cols[$this->param->value])) {
25
-      $col = $cols[$this->param->value];
26
-      if ($col['type'] == 'dynamicType') {
25
+        $col = $cols[$this->param->value];
26
+        if ($col['type'] == 'dynamicType') {
27 27
         switch ($col['typeSource']) {
28
-          case'selfMethod':
28
+            case'selfMethod':
29 29
             $type = $this->model->{$col['selfMethod']}();
30 30
             if (is_array($type)) {
31
-              if (strpos($type['relation'], ':')) {
31
+                if (strpos($type['relation'], ':')) {
32 32
                 $relationPath = explode(':', $type['relation']);
33 33
                 $relationName = array_pop($relationPath);
34 34
                 $item = $this->model;
35 35
                 foreach ($relationPath as $path) {
36
-                  $item = $item->$path;
36
+                    $item = $item->$path;
37 37
                 }
38 38
                 $itemModel = get_class($item);
39 39
                 $relation = $itemModel::getRelation($relationName);
40 40
                 $sourceModel = $relation['model'];
41
-              } else {
41
+                } else {
42 42
                 $relation = $modelName::getRelation($type['relation']);
43 43
                 $sourceModel = $relation['model'];
44
-              }
45
-              $objectId = \App::$cur->migrations->findObject((string) $value, $sourceModel);
46
-              if ($objectId) {
44
+                }
45
+                $objectId = \App::$cur->migrations->findObject((string) $value, $sourceModel);
46
+                if ($objectId) {
47 47
                 $value = $objectId->object_id;
48
-              }
48
+                }
49 49
             }
50 50
             break;
51 51
         }
52
-      } else {
52
+        } else {
53 53
         $type = $col['type'];
54
-      }
54
+        }
55 55
     } else {
56
-      $type = 'text';
56
+        $type = 'text';
57 57
     }
58 58
 
59 59
     if (!empty($options['valueReplace'])) {
60
-      $values = $this->param->values(['key' => 'original']);
61
-      if (empty($values[$value])) {
60
+        $values = $this->param->values(['key' => 'original']);
61
+        if (empty($values[$value])) {
62 62
         $valueObject = new \Migrations\Migration\Object\Param\Value();
63 63
         $valueObject->param_id = $this->param->id;
64 64
         $valueObject->original = $value;
65 65
         $valueObject->save();
66
-      } else {
66
+        } else {
67 67
         $valueObject = $values[$value];
68
-      }
69
-      $value = $valueObject->replace;
68
+        }
69
+        $value = $valueObject->replace;
70 70
     }
71 71
     switch ($type) {
72
-      case 'image':
72
+        case 'image':
73 73
         $notEq = true;
74 74
         $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
75 75
         if ($this->model->{$this->param->value}) {
76
-          $file = \Files\File::get($this->model->{$this->param->value});
77
-          if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) {
76
+            $file = \Files\File::get($this->model->{$this->param->value});
77
+            if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) {
78 78
             $notEq = false;
79
-          }
80
-          if ($file && $notEq) {
79
+            }
80
+            if ($file && $notEq) {
81 81
             $file->delete();
82 82
             $this->model->{$this->param->value} = 0;
83
-          }
83
+            }
84 84
         }
85 85
         if ($notEq) {
86
-          $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
86
+            $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
87 87
         }
88 88
         break;
89
-      default:
89
+        default:
90 90
         if (is_array($value)) {
91
-          $value = implode(' ', $value);
91
+            $value = implode(' ', $value);
92 92
         }
93 93
         $this->model->{$this->param->value} = $value;
94 94
     }
95
-  }
95
+    }
96 96
 
97 97
 }
Please login to merge, or discard this patch.
system/modules/Ecommerce/models/Item/Option.php 1 patch
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -13,63 +13,63 @@  discard block
 block discarded – undo
13 13
 
14 14
 class Option extends \Model {
15 15
 
16
-  public static $objectName = 'Свойство';
17
-  public static $cols = [
18
-      //Основные параметры
19
-      'name' => ['type' => 'text'],
20
-      'filter_name' => ['type' => 'text'],
21
-      'image_file_id' => ['type' => 'image'],
22
-      'code' => ['type' => 'text'],
23
-      'type' => ['type' => 'text'],
24
-      'postfix' => ['type' => 'text'],
25
-      'default_val' => ['type' => 'text'],
26
-      'view' => ['type' => 'bool'],
27
-      'searchable' => ['type' => 'bool'],
28
-      //Системные
29
-      'weight' => ['type' => 'number'],
30
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
31
-      'advance' => ['type' => 'text'],
32
-      'date_create' => ['type' => 'dateTime'],
33
-      //Менеджеры
34
-      'item' => ['type' => 'dataManager', 'relation' => 'items'],
35
-  ];
36
-  public static $labels = [
37
-      'name' => 'Название',
38
-      'filter_name' => 'Название в фильтре',
39
-      'image_file_id' => 'Иконка',
40
-      'code' => 'Код',
41
-      'type' => 'Тип',
42
-      'postfix' => 'Постфикс',
43
-      'default_val' => 'Значение по умолчанию',
44
-      'view' => 'Отображается',
45
-      'searchable' => 'Используется при поиске',
46
-      'weight' => 'Вес сортировки',
47
-      'advance' => 'Дополнительные параметры',
48
-      'user_id' => 'Создатель',
49
-      'date_create' => 'Дата создания',
50
-      'item' => 'Значения для списка'
51
-  ];
52
-  public static $dataManagers = [
53
-      'manager' => [
54
-          'name' => 'Свойства товаров',
55
-          'cols' => [
56
-              'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create'
57
-          ]
58
-      ]
59
-  ];
60
-  public static $forms = [
61
-      'manager' => [
62
-          'map' => [
63
-              ['name', 'filter_name'],
64
-              ['code', 'type', 'image_file_id'],
65
-              ['default_val', 'postfix'],
66
-              ['view', 'searchable'],
67
-              ['item']
68
-          ]
69
-      ]
70
-  ];
16
+    public static $objectName = 'Свойство';
17
+    public static $cols = [
18
+        //Основные параметры
19
+        'name' => ['type' => 'text'],
20
+        'filter_name' => ['type' => 'text'],
21
+        'image_file_id' => ['type' => 'image'],
22
+        'code' => ['type' => 'text'],
23
+        'type' => ['type' => 'text'],
24
+        'postfix' => ['type' => 'text'],
25
+        'default_val' => ['type' => 'text'],
26
+        'view' => ['type' => 'bool'],
27
+        'searchable' => ['type' => 'bool'],
28
+        //Системные
29
+        'weight' => ['type' => 'number'],
30
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
31
+        'advance' => ['type' => 'text'],
32
+        'date_create' => ['type' => 'dateTime'],
33
+        //Менеджеры
34
+        'item' => ['type' => 'dataManager', 'relation' => 'items'],
35
+    ];
36
+    public static $labels = [
37
+        'name' => 'Название',
38
+        'filter_name' => 'Название в фильтре',
39
+        'image_file_id' => 'Иконка',
40
+        'code' => 'Код',
41
+        'type' => 'Тип',
42
+        'postfix' => 'Постфикс',
43
+        'default_val' => 'Значение по умолчанию',
44
+        'view' => 'Отображается',
45
+        'searchable' => 'Используется при поиске',
46
+        'weight' => 'Вес сортировки',
47
+        'advance' => 'Дополнительные параметры',
48
+        'user_id' => 'Создатель',
49
+        'date_create' => 'Дата создания',
50
+        'item' => 'Значения для списка'
51
+    ];
52
+    public static $dataManagers = [
53
+        'manager' => [
54
+            'name' => 'Свойства товаров',
55
+            'cols' => [
56
+                'name', 'code', 'type', 'item', 'view', 'searchable', 'user_id', 'date_create'
57
+            ]
58
+        ]
59
+    ];
60
+    public static $forms = [
61
+        'manager' => [
62
+            'map' => [
63
+                ['name', 'filter_name'],
64
+                ['code', 'type', 'image_file_id'],
65
+                ['default_val', 'postfix'],
66
+                ['view', 'searchable'],
67
+                ['item']
68
+            ]
69
+        ]
70
+    ];
71 71
 
72
-  public static function relations() {
72
+    public static function relations() {
73 73
     return [
74 74
         'user' => [
75 75
             'model' => 'Users\User',
@@ -85,15 +85,15 @@  discard block
 block discarded – undo
85 85
             'col' => 'image_file_id'
86 86
         ],
87 87
     ];
88
-  }
88
+    }
89 89
 
90
-  public function beforeSave() {
90
+    public function beforeSave() {
91 91
     if (!isset($this->id)) {
92
-      $this->user_id = \Users\User::$cur->id;
92
+        $this->user_id = \Users\User::$cur->id;
93 93
     }
94 94
     if ($this->advance && is_array($this->advance)) {
95
-      $this->advance = json_encode($this->advance);
95
+        $this->advance = json_encode($this->advance);
96
+    }
96 97
     }
97
-  }
98 98
 
99 99
 }
Please login to merge, or discard this patch.
system/modules/Ui/widgets/DataManager/DataManager.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -22,13 +22,13 @@
 block discarded – undo
22 22
     'style' => ''
23 23
 ];
24 24
 if (!empty($dataManager->managerOptions['categorys'])) {
25
-  $mainCol['style'].='margin-left:260px;';
26
-  echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
27
-  $this->widget('Ui\DataManager/categorys', compact('dataManager'));
28
-  echo '</div>';
25
+    $mainCol['style'].='margin-left:260px;';
26
+    echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
27
+    $this->widget('Ui\DataManager/categorys', compact('dataManager'));
28
+    echo '</div>';
29 29
 }
30 30
 if (!empty($dataManager->managerOptions['filters'])) {
31
-  ?>
31
+    ?>
32 32
   <div class="modal fade" id = "<?= $dataManager->managerId; ?>_filters" >
33 33
     <div class="modal-dialog modal-lg">
34 34
       <div class="modal-content">
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/select.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,9 +2,9 @@
 block discarded – undo
2 2
 $aditionalInputs = [];
3 3
 $showedInput = false;
4 4
 if(!empty($options['createBtn'])){
5
-  $optionsHtml = '<option disabled onclick="'.$options['createBtn']['onclick'].'">'.$options['createBtn']['text'].'</option>';
5
+    $optionsHtml = '<option disabled onclick="'.$options['createBtn']['onclick'].'">'.$options['createBtn']['text'].'</option>';
6 6
 }else {
7
-  $optionsHtml = '';
7
+    $optionsHtml = '';
8 8
 }
9 9
 
10 10
 foreach ($options['values'] as $key => $value) {
Please login to merge, or discard this patch.
system/modules/Ui/objects/ActiveForm/Input/Select.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 class Select extends \Ui\ActiveForm\Input {
15 15
 
16
-  public function draw() {
16
+    public function draw() {
17 17
     $inputName = $this->colName();
18 18
     $inputLabel = $this->colLabel();
19 19
     $inputParams = $this->colParams;
@@ -25,41 +25,41 @@  discard block
 block discarded – undo
25 25
     ];
26 26
     $modelName = '';
27 27
     switch ($inputParams['source']) {
28
-      case 'model':
28
+        case 'model':
29 29
         $modelName = $inputParams['model'];
30 30
         break;
31
-      case 'relation':
31
+        case 'relation':
32 32
         if ($this->activeForm->modelName) {
33
-          $itemModelName = $this->activeForm->modelName;
34
-          $relation = $itemModelName::getRelation($inputParams['relation']);
35
-          if ($relation['model'] && class_exists($relation['model'])) {
33
+            $itemModelName = $this->activeForm->modelName;
34
+            $relation = $itemModelName::getRelation($inputParams['relation']);
35
+            if ($relation['model'] && class_exists($relation['model'])) {
36 36
             $modelName = $relation['model'];
37
-          }
37
+            }
38 38
         }
39 39
     }
40 40
     if (!empty($modelName)) {
41
-      $inputOptions['createBtn'] = [
42
-          'text' => 'Создать элемент',
43
-          'onclick' => 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
44
-          . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this))'
45
-      ];
41
+        $inputOptions['createBtn'] = [
42
+            'text' => 'Создать элемент',
43
+            'onclick' => 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
44
+            . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this))'
45
+        ];
46 46
     }
47 47
     if (!empty($inputOptions['values'][$this->activeForm->model->{$this->colName}]) &&
48 48
             is_array($inputOptions['values'][$this->activeForm->model->{$this->colName}]) &&
49 49
             !empty($inputOptions['values'][$this->activeForm->model->{$this->colName}]['input'])) {
50
-      $aditionalCol = $inputOptions['values'][$this->activeForm->model->{$this->colName}]['input']['name'];
51
-      $inputOptions['aditionalValue'] = $this->activeForm->model->$aditionalCol;
50
+        $aditionalCol = $inputOptions['values'][$this->activeForm->model->{$this->colName}]['input']['name'];
51
+        $inputOptions['aditionalValue'] = $this->activeForm->model->$aditionalCol;
52 52
     }
53 53
 
54 54
     $preset = $this->preset();
55 55
 
56 56
     if ($preset !== null) {
57
-      $inputOptions['disabled'] = true;
58
-      $this->form->input('hidden', $inputName, '', $inputOptions);
59
-      return true;
57
+        $inputOptions['disabled'] = true;
58
+        $this->form->input('hidden', $inputName, '', $inputOptions);
59
+        return true;
60 60
     }
61 61
     $this->form->input('select', $inputName, $inputLabel, $inputOptions);
62 62
     return true;
63
-  }
63
+    }
64 64
 
65 65
 }
Please login to merge, or discard this patch.