Completed
Push — master ( 135fa8...4a5eb0 )
by Alexey
09:51 queued 04:36
created
system/modules/Ui/widgets/Form/dynamicList.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     ?>
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/dataManager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/changePassword.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
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">
Please login to merge, or discard this patch.
system/modules/Ui/widgets/ActiveForm/ActiveForm.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-$id = 'activeForm-' . Tools::randomString();
2
+$id = 'activeForm-'.Tools::randomString();
3 3
 $formInputs = $activeForm->inputs;
4 4
 foreach ($formInputs as $inputName => $inputParams) {
5 5
     if (is_object($inputParams)) {
Please login to merge, or discard this patch.
system/modules/Ui/widgets/DataManager/filters.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 if (!$dataManager->checkAccess()) {
3
-    echo 'you not have access to "' . $dataManager->modelName . '" manager with name: "' . $dataManager->managerName . '"';
3
+    echo 'you not have access to "'.$dataManager->modelName.'" manager with name: "'.$dataManager->managerName.'"';
4 4
     return false;
5 5
 }
6 6
 ?>
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
                             $options = [
62 62
                                 'where' => !empty($filters['getRows']['where']) ? $filters['getRows']['where'] : ''
63 63
                             ];
64
-                            if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix() . 'name'])) {
64
+                            if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix().'name'])) {
65 65
                                 $options['order'] = 'name';
66 66
                             }
67 67
                             $items = $relations[$colInfo['colParams']['relation']]['model']::getList($options);
Please login to merge, or discard this patch.
system/modules/Ui/widgets/DataManager/managerButtons.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 $html = '';
4 4
 foreach ($buttons as $button) {
5 5
     if (!empty($button['class'])) {
6
-        $button['class'] = 'btn btn-primary btn-sm ' . $button['class'];
6
+        $button['class'] = 'btn btn-primary btn-sm '.$button['class'];
7 7
     } else {
8 8
         $button['class'] = 'btn btn-primary btn-sm';
9 9
     }
Please login to merge, or discard this patch.
system/modules/Ui/widgets/DataManager/DataManager.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
     'id' => $dataManager->managerId,
4 4
     'class' => 'dataManager',
5 5
     'data-params' => $params,
6
-    'data-modelname' => ($model ? get_class($model) : $dataManager->modelName) . ($model && $model->pk() ? ':' . $model->pk() : ''),
6
+    'data-modelname' => ($model ? get_class($model) : $dataManager->modelName).($model && $model->pk() ? ':'.$model->pk() : ''),
7 7
     'data-managername' => $dataManager->managerName,
8 8
     'data-cols' => $dataManager->cols,
9 9
     'data-options' => $dataManager->managerOptions
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
     'style' => ''
23 23
 ];
24 24
 if (!empty($dataManager->managerOptions['categorys'])) {
25
-    $mainCol['style'].='margin-left:260px;';
25
+    $mainCol['style'] .= 'margin-left:260px;';
26 26
     echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
27 27
     $this->widget('Ui\DataManager/categorys', compact('dataManager'));
28 28
     echo '</div>';
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Pages/pages.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,28 +1,28 @@
 block discarded – undo
1 1
 <ul class="<?= $class; ?>"><?php
2 2
   if ($pagesInstance->params['page'] > 1) {
3 3
       $getArr['page'] = $pagesInstance->params['page'] - 1;
4
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&larr;</a></li>";
4
+      echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>&larr;</a></li>";
5 5
   }
6 6
 
7 7
   for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
8
-      if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
8
+      if (($i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
9 9
           echo '<li ';
10 10
           if ($pagesInstance->params['page'] == $i)
11 11
               echo 'class = "active"';
12 12
           echo ">";
13 13
           $getArr['page'] = $i;
14
-          echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
14
+          echo "<a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>{$i}</a></li>";
15 15
       }
16 16
       elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
17 17
           $getArr['page'] = round($pagesInstance->params['page'] / 2);
18
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
18
+          echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>...</a></li>";
19 19
       } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
20 20
           $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page'];
21
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
21
+          echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>...</a></li>";
22 22
       }
23 23
   }
24 24
   if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) {
25 25
       $getArr['page'] = $pagesInstance->params['page'] + 1;
26
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&rarr;</a></li>";
26
+      echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>&rarr;</a></li>";
27 27
   }
28 28
   ?></ul>
29 29
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Table/row.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@
 block discarded – undo
4 4
         if (is_array($html)) {
5 5
             extract($html);
6 6
         }
7
-        echo "<td " . (!empty($class) ? "class='{$class}'" : '') . ">{$html}</td>";
7
+        echo "<td ".(!empty($class) ? "class='{$class}'" : '').">{$html}</td>";
8 8
     }
9 9
     ?>
10 10
 </tr>
11 11
\ No newline at end of file
Please login to merge, or discard this patch.