injitools / cms-Inji

system/modules/Ui/Controllers/DataManagerController.php

Indentation +80 added lines, -80 removed lines

@@ -10,31 +10,31 @@ 
  */
 class DataManagerController extends Controller {
 
-  public function parseRequest() {
+    public function parseRequest() {
     $return = [];
     $return['params'] = UserRequest::get('params', 'array', []);
 
     $item = UserRequest::get('modelName', 'string', '');
     if (!$item) {
-      $item = UserRequest::get('item', 'string', '');
+        $item = UserRequest::get('item', 'string', '');
     }
 
     if (strpos($item, ':')) {
-      $raw = explode(':', $item);
-      $return['modelName'] = $raw[0];
-      $return['model'] = $return['modelName']::get($raw[1], $return['modelName']::index(), $return['params']);
+        $raw = explode(':', $item);
+        $return['modelName'] = $raw[0];
+        $return['model'] = $return['modelName']::get($raw[1], $return['modelName']::index(), $return['params']);
     } else {
-      $return['modelName'] = $item;
-      $return['model'] = null;
+        $return['modelName'] = $item;
+        $return['model'] = null;
     }
 
     if (!empty($return['params']['relation'])) {
-      $relation = $return['modelName']::getRelation($return['params']['relation']);
-      if (!empty($relation['type']) && $relation['type'] == 'relModel') {
+        $relation = $return['modelName']::getRelation($return['params']['relation']);
+        if (!empty($relation['type']) && $relation['type'] == 'relModel') {
         $return['modelName'] = $relation['relModel'];
-      } else {
+        } else {
         $return['modelName'] = $relation['model'];
-      }
+        }
     }
     $return['params']['filters'] = UserRequest::get('filters', 'array', []);
     $return['params']['sortered'] = UserRequest::get('sortered', 'array', []);
@@ -54,13 +54,13 @@ 
 
     $return['managerName'] = UserRequest::get('managerName', 'string', 'manager');
     if (!$return['managerName']) {
-      $return['managerName'] = 'manager';
+        $return['managerName'] = 'manager';
     }
 
     return $return;
-  }
+    }
 
-  public function indexAction() {
+    public function indexAction() {
     $result = new Server\Result();
 
     ob_start();
@@ -75,9 +75,9 @@ 
     ob_end_clean();
 
     $result->send();
-  }
+    }
 
-  public function loadRowsAction() {
+    public function loadRowsAction() {
     $result = new Server\Result();
     $result->content = [];
 
@@ -88,55 +88,55 @@ 
     $dataManager = new Ui\DataManager($request['modelName'], $request['managerName']);
     if ($request['download']) {
 
-      ini_set('memory_limit', '2000M');
-      set_time_limit(0);
+        ini_set('memory_limit', '2000M');
+        set_time_limit(0);
 
-      $request['params']['all'] = true;
-      $request['params']['download'] = true;
-      ob_end_clean();
-      header('Content-Encoding: UTF-8');
-      header("Content-Type: text/csv");
-      header("Content-Disposition: attachment; filename=" . $request['modelName']::$objectName . '.csv');
-      echo "\xEF\xBB\xBF"; // UTF-8 BOM
+        $request['params']['all'] = true;
+        $request['params']['download'] = true;
+        ob_end_clean();
+        header('Content-Encoding: UTF-8');
+        header("Content-Type: text/csv");
+        header("Content-Disposition: attachment; filename=" . $request['modelName']::$objectName . '.csv');
+        echo "\xEF\xBB\xBF"; // UTF-8 BOM
 
 
-      $cols = $dataManager->getCols();
-      $cols = array_slice($cols, 1);
-      $endRow = true;
-      foreach ($cols as $colName => $options) {
+        $cols = $dataManager->getCols();
+        $cols = array_slice($cols, 1);
+        $endRow = true;
+        foreach ($cols as $colName => $options) {
         if (!$endRow) {
-          echo ";";
+            echo ";";
         }
         $endRow = false;
         echo '"' . $options['label'] . '"';
-      }
-      echo "\n";
-      $endRow = true;
+        }
+        echo "\n";
+        $endRow = true;
     }
     if (!$request['params']['all']) {
-      $pages = $dataManager->getPages($request['params'], $request['model']);
-      $request['params']['page'] = !empty($pages->params['page']) ? $pages->params['page'] : $dataManager->page;
-      $request['params']['limit'] = !empty($pages->params['limit']) ? $pages->params['limit'] : $dataManager->limit;
+        $pages = $dataManager->getPages($request['params'], $request['model']);
+        $request['params']['page'] = !empty($pages->params['page']) ? $pages->params['page'] : $dataManager->page;
+        $request['params']['limit'] = !empty($pages->params['limit']) ? $pages->params['limit'] : $dataManager->limit;
     }
     $rows = $dataManager->getRows($request['params'], $request['model']);
     foreach ($rows as $row) {
-      if ($request['download']) {
+        if ($request['download']) {
         $row = array_slice($row, 1, -1);
         foreach ($row as $col) {
-          if (!$endRow) {
+            if (!$endRow) {
             echo ";";
-          }
-          $endRow = false;
-          echo '"' . str_replace(["\n", '"'], ['“'], $col) . '"';
+            }
+            $endRow = false;
+            echo '"' . str_replace(["\n", '"'], ['“'], $col) . '"';
         }
         echo "\n";
         $endRow = true;
-      } else {
+        } else {
         Ui\Table::drawRow($row);
-      }
+        }
     }
     if ($request['download']) {
-      exit();
+        exit();
     }
 
     $result->content['rows'] = ob_get_contents();
@@ -145,17 +145,17 @@ 
     $result->content['pages'] = '';
 
     if (isset($pages) && $pages) {
-      if ($pages) {
+        if ($pages) {
         $pages->draw();
         echo '<div style="background:#fff;">записей: <b>' . $pages->options['count'] . '</b>. страница <b>' . $pages->params['page'] . '</b> из <b>' . $pages->params['pages'] . '</b></div>';
-      }
-      $result->content['pages'] = ob_get_contents();
-      ob_end_clean();
+        }
+        $result->content['pages'] = ob_get_contents();
+        ob_end_clean();
     }
     $result->send();
-  }
+    }
 
-  public function loadCategorysAction() {
+    public function loadCategorysAction() {
     $result = new Server\Result();
 
     ob_start();
@@ -169,88 +169,88 @@ 
     ob_end_clean();
 
     $result->send();
-  }
+    }
 
-  public function delRowAction() {
+    public function delRowAction() {
 
     $request = $this->parseRequest();
 
     $dataManager = new Ui\DataManager($request['modelName'], $request['managerName']);
 
     if ($dataManager->checkAccess()) {
-      $model = $request['modelName']::get($request['key'], $request['modelName']::index(), $request['params']);
-      if ($model) {
+        $model = $request['modelName']::get($request['key'], $request['modelName']::index(), $request['params']);
+        if ($model) {
         $model->delete($request['params']);
-      }
+        }
     }
     $result = new Server\Result();
     $result->successMsg = empty($request['silence']) ? 'Запись удалена' : '';
     $result->send();
-  }
+    }
 
-  public function updateRowAction() {
+    public function updateRowAction() {
 
     $request = $this->parseRequest();
 
     $dataManager = new Ui\DataManager($request['modelName'], $request['managerName']);
 
     if ($dataManager->checkAccess()) {
-      $model = $request['modelName']::get($request['key'], $request['modelName']::index(), $request['params']);
-      if ($model) {
+        $model = $request['modelName']::get($request['key'], $request['modelName']::index(), $request['params']);
+        if ($model) {
         $model->{$request['col']} = $request['col_value'];
         $model->save($request['params']);
-      }
+        }
     }
     $result = new Server\Result();
     $result->successMsg = empty($request['silence']) ? 'Запись Обновлена' : '';
     $result->send();
-  }
+    }
 
-  public function groupActionAction() {
+    public function groupActionAction() {
     $request = $this->parseRequest();
     $dataManager = new Ui\DataManager($request['modelName'], $request['managerName']);
     $result = new Server\Result();
     $result->success = false;
     $result->content = 'Не удалось выполнить операцию';
     if ($dataManager->checkAccess()) {
-      $ids = trim($request['ids'], ' ,');
-      if ($request['action'] && $ids) {
+        $ids = trim($request['ids'], ' ,');
+        if ($request['action'] && $ids) {
         $actions = $dataManager->getActions();
         if (!empty($actions[$request['action']])) {
-          $actionParams = $actions[$request['action']];
-          if (!empty($actionParams['access']['groups']) && !in_array(\Users\User::$cur->group_id, $actionParams['access']['groups'])) {
+            $actionParams = $actions[$request['action']];
+            if (!empty($actionParams['access']['groups']) && !in_array(\Users\User::$cur->group_id, $actionParams['access']['groups'])) {
             $result->content = 'У вас нет прав доступа к операции ' . (!isset($actionParams['name']) ? $actionParams['className']::$name : $actionParams['name']);
-          } else {
+            } else {
             try {
-              $result->successMsg = $actionParams['className']::groupAction($dataManager, $ids, $actionParams, !empty($_GET['adInfo']) ? $_GET['adInfo'] : []);
-              $result->success = true;
+                $result->successMsg = $actionParams['className']::groupAction($dataManager, $ids, $actionParams, !empty($_GET['adInfo']) ? $_GET['adInfo'] : []);
+                $result->success = true;
             } catch (\Exception $e) {
-              $result->content = $e->getMessage();
+                $result->content = $e->getMessage();
             }
-          }
+            }
+        }
         }
-      }
     } else {
-      $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
+        $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
     }
     $result->send();
-  }
+    }
 
-  public function delCategoryAction() {
+    public function delCategoryAction() {
 
     $request = $this->parseRequest();
 
     $dataManager = new Ui\DataManager($request['modelName'], $request['managerName']);
 
     if ($dataManager->checkAccess() && !empty($dataManager->managerOptions['categorys'])) {
-      $categoryModel = $dataManager->managerOptions['categorys']['model'];
-      $model = $categoryModel::get($request['key'], $categoryModel::index(), $request['params']);
-      if ($model) {
+        $categoryModel = $dataManager->managerOptions['categorys']['model'];
+        $model = $categoryModel::get($request['key'], $categoryModel::index(), $request['params']);
+        if ($model) {
         $model->delete($request['params']);
-      }
+        }
     }
     $result = new Server\Result();
     $result->send();
-  }
+    }
 
 }

system/modules/Ui/widgets/Form/dateTime.php

Indentation +4 added lines, -4 removed lines

@@ -9,16 +9,16 @@
     'value' => !empty($options['value']) ? addcslashes($options['value'], "'") : (!empty($form->userDataTree[$name]) ? addcslashes($form->userDataTree[$name], "'") : '')
 ];
 if (!empty($options['disabled'])) {
-  $attributes['disabled'] = 'disabled';
+    $attributes['disabled'] = 'disabled';
 }
 if (!empty($options['placeholder'])) {
-  $attributes['placeholder'] = $options['placeholder'];
+    $attributes['placeholder'] = $options['placeholder'];
 }
 if (!empty($options['checked'])) {
-  $attributes['checked'] = 'checked';
+    $attributes['checked'] = 'checked';
 }
 if (!empty($options['attributes'])) {
-  $attributes = array_merge($attributes, $options['attributes']);
+    $attributes = array_merge($attributes, $options['attributes']);
 }
 echo Html::el('input', $attributes, '', null);
 echo!empty($options['helpText']) ? "<div class='help-block'>{$options['helpText']}</div>" : '';

system/program/admin/templates/default/widgets/sidebar.php

Indentation +12 added lines, -12 removed lines

@@ -7,8 +7,8 @@ 
     </li>
     <?php
     if (class_exists('Users\User')) {
-      App::$cur->ui;
-      ?>
+        App::$cur->ui;
+        ?>
       <hr />
       <div class="row userWidget">
         <div class="col-xs-4">
@@ -29,23 +29,23 @@ 
         <a href = "/admin">Панель управления</a>
       </li>
       <?php
-      $where[] = ['group_id', Users\User::$cur->group_id];
-      if (Users\User::$cur->group_id == 3) {
+        $where[] = ['group_id', Users\User::$cur->group_id];
+        if (Users\User::$cur->group_id == 3) {
         $where[] = ['group_id', 0, '=', 'OR'];
-      }
-      $menu = Menu\Menu::get([['code', 'sidebarMenu'], $where]);
-      foreach ($menu->items(['where' => ['parent_id', 0], 'order' => ['weight', 'asc']]) as $item) {
+        }
+        $menu = Menu\Menu::get([['code', 'sidebarMenu'], $where]);
+        foreach ($menu->items(['where' => ['parent_id', 0], 'order' => ['weight', 'asc']]) as $item) {
         echo "<li><a href = '{$item->href}'>{$item->name}</a>";
         $childItems = Menu\Item::getList(['where' => ['parent_id', $item->id]]);
         if ($childItems) {
-          echo "<ul>";
-          foreach ($childItems as $item) {
+            echo "<ul>";
+            foreach ($childItems as $item) {
             echo "<li><a href = '{$item->href}'>{$item->name}</a>";
-          }
-          echo "</ul>";
+            }
+            echo "</ul>";
         }
         echo "</li>";
-      }
+        }
     }
     ?>
     <li>

system/program/admin/objects/adminController.php

Indentation +23 added lines, -23 removed lines

@@ -10,55 +10,55 @@
  */
 class adminController extends Controller {
 
-  public function indexAction() {
+    public function indexAction() {
     $args = func_get_args();
     call_user_func_array([$this, 'dataManagerAction'], $args);
-  }
+    }
 
-  public function dataManagerAction($model = '', $dataManager = 'manager') {
+    public function dataManagerAction($model = '', $dataManager = 'manager') {
     if (!$model) {
-      $modulePath = Module::getModulePath($this->module->moduleName);
-      $path = $modulePath . '/models';
-      if (file_exists($path)) {
+        $modulePath = Module::getModulePath($this->module->moduleName);
+        $path = $modulePath . '/models';
+        if (file_exists($path)) {
         $files = array_slice(scandir($path), 2);
         foreach ($files as $file) {
-          if (is_dir($path . '/' . $file)) {
+            if (is_dir($path . '/' . $file)) {
             continue;
-          }
-          $model = pathinfo($file, PATHINFO_FILENAME);
-          break;
+            }
+            $model = pathinfo($file, PATHINFO_FILENAME);
+            break;
+        }
         }
-      }
     }
     $fullModelName = $this->module->moduleName . '\\' . ucfirst($model);
     $dataManager = new Ui\DataManager($fullModelName, $dataManager);
     $title = !empty($dataManager->managerOptions['name']) ? $dataManager->managerOptions['name'] : $fullModelName::objectName();
     $this->view->setTitle($title);
     $this->view->page(['module' => 'Ui', 'content' => 'dataManager/manager', 'data' => compact('dataManager')]);
-  }
+    }
 
-  public function viewAction($model, $pk) {
+    public function viewAction($model, $pk) {
     $fullModelName = $this->module->moduleName . '\\' . ucfirst($model);
     if (Users\User::$cur->group_id != 3 && (empty($fullModelName::$views['manager']['access']) || !in_array(Users\User::$cur->group_id, $fullModelName::$views['manager']['access']['groups']))) {
-      Tools::redirect('/admin', 'У вас нет прав доступа для просмотра этого объекта', 'danger');
+        Tools::redirect('/admin', 'У вас нет прав доступа для просмотра этого объекта', 'danger');
     }
     $item = $fullModelName::get($pk);
     $this->view->setTitle(($fullModelName::$objectName ? $fullModelName::$objectName : $fullModelName) . ($item ? ( ' - ' . $item->name()) : ''));
     if (!empty($_POST['comment'])) {
-      $comment = new Dashboard\Comment();
-      $comment->text = $_POST['comment'];
-      $comment->user_id = \Users\User::$cur->id;
-      $comment->model = $fullModelName;
-      $comment->item_id = $item->pk();
-      $comment->save();
-      Tools::redirect($_SERVER['REQUEST_URI']);
+        $comment = new Dashboard\Comment();
+        $comment->text = $_POST['comment'];
+        $comment->user_id = \Users\User::$cur->id;
+        $comment->model = $fullModelName;
+        $comment->item_id = $item->pk();
+        $comment->save();
+        Tools::redirect($_SERVER['REQUEST_URI']);
     }
     $moduleName = $this->module->moduleName;
     $pageParam = ['module' => 'Ui', 'content' => 'dataManager/view', 'data' => compact('item', 'moduleName')];
     if (isset($_GET['print'])) {
-      $pageParam['page'] = 'print';
+        $pageParam['page'] = 'print';
     }
     $this->view->page($pageParam);
-  }
+    }
 
 }

system/modules/Files/models/File.php

Indentation +23 added lines, -23 removed lines

@@ -13,39 +13,39 @@ 
 
 class File extends \Model {
 
-  public static $cols = [
-      'code' => ['type' => 'text'],
-      'type_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'type'],
-      'folder_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'foler'],
-      'upload_code' => ['type' => 'text'],
-      'path' => ['type' => 'textarea'],
-      'name' => ['type' => 'text'],
-      'about' => ['type' => 'html'],
-      'original_name' => ['type' => 'text'],
-      'md5' => ['type' => 'text'],
-      'date_create' => ['type' => 'dateTime'],
-  ];
-
-  public function beforeSave() {
+    public static $cols = [
+        'code' => ['type' => 'text'],
+        'type_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'type'],
+        'folder_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'foler'],
+        'upload_code' => ['type' => 'text'],
+        'path' => ['type' => 'textarea'],
+        'name' => ['type' => 'text'],
+        'about' => ['type' => 'html'],
+        'original_name' => ['type' => 'text'],
+        'md5' => ['type' => 'text'],
+        'date_create' => ['type' => 'dateTime'],
+    ];
+
+    public function beforeSave() {
     $path = $this->getRealPath();
     if (!$this->md5 && $this->path && file_exists($path)) {
-      $this->md5 = md5_file($path);
+        $this->md5 = md5_file($path);
+    }
     }
-  }
 
-  public function beforeDelete() {
+    public function beforeDelete() {
     $path = $this->getRealPath();
     if (file_exists($path)) {
-      unlink($path);
+        unlink($path);
+    }
     }
-  }
 
-  public function getRealPath() {
+    public function getRealPath() {
     $sitePath = \App::$primary->path;
     return "{$sitePath}{$this->path}";
-  }
+    }
 
-  public static function relations() {
+    public static function relations() {
     return [
         'type' => [
             'model' => 'Files\Type',
@@ -56,6 +56,6 @@ 
             'col' => 'folder_id'
         ],
     ];
-  }
+    }
 
 }

system/modules/Files/install_script.php

Indentation +61 added lines, -61 removed lines

@@ -1,67 +1,67 @@
 <?php
 
 return function($step = NULL, $params = []) {
-  $options = ['max_height' => 1200, 'max_width' => 1200];
-  $types = [
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'png',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'jpeg',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'jpg',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/images/',
-          'ext' => 'gif',
-          'group' => 'image',
-          'allow_resize' => 1,
-          'options' => json_encode($options)
-      ],
-      [
-          'dir' => '/static/mediafiles/docs/',
-          'ext' => 'xls',
-          'group' => 'doc',
-          'allow_resize' => 0,
-          'options' => ''
-      ],
-      [
-          'dir' => '/static/mediafiles/docs/',
-          'ext' => 'pdf',
-          'group' => 'doc',
-          'allow_resize' => 0,
-          'options' => ''
-      ],
-      [
-          'dir' => '/static/mediafiles/docs/',
-          'ext' => 'docx',
-          'group' => 'doc',
-          'allow_resize' => 0,
-          'options' => ''
-      ],
-      [
-          'dir' => '/static/mediafiles/docs/',
-          'ext' => 'xlsx',
-          'group' => 'doc',
-          'allow_resize' => 0,
-          'options' => ''
-      ],
-  ];
-  foreach ($types as $type) {
+    $options = ['max_height' => 1200, 'max_width' => 1200];
+    $types = [
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'png',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'jpeg',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'jpg',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/images/',
+            'ext' => 'gif',
+            'group' => 'image',
+            'allow_resize' => 1,
+            'options' => json_encode($options)
+        ],
+        [
+            'dir' => '/static/mediafiles/docs/',
+            'ext' => 'xls',
+            'group' => 'doc',
+            'allow_resize' => 0,
+            'options' => ''
+        ],
+        [
+            'dir' => '/static/mediafiles/docs/',
+            'ext' => 'pdf',
+            'group' => 'doc',
+            'allow_resize' => 0,
+            'options' => ''
+        ],
+        [
+            'dir' => '/static/mediafiles/docs/',
+            'ext' => 'docx',
+            'group' => 'doc',
+            'allow_resize' => 0,
+            'options' => ''
+        ],
+        [
+            'dir' => '/static/mediafiles/docs/',
+            'ext' => 'xlsx',
+            'group' => 'doc',
+            'allow_resize' => 0,
+            'options' => ''
+        ],
+    ];
+    foreach ($types as $type) {
     $typeObject = new \Files\Type($type);
     $typeObject->save();
-  }
+    }
 };

system/modules/Ui/objects/ActiveForm/Input/File.php

Indentation +13 added lines, -13 removed lines

@@ -13,22 +13,22 @@
 
 class File extends \Ui\ActiveForm\Input {
 
-  public function parseRequest($request) {
+    public function parseRequest($request) {
     if (!empty($_FILES[$this->activeForm->requestFormName]['tmp_name'][$this->modelName][$this->colName])) {
-      $file_id = \App::$primary->files->upload([
-          'tmp_name' => $_FILES[$this->activeForm->requestFormName]['tmp_name'][$this->modelName][$this->colName],
-          'name' => $_FILES[$this->activeForm->requestFormName]['name'][$this->modelName][$this->colName],
-          'type' => $_FILES[$this->activeForm->requestFormName]['type'][$this->modelName][$this->colName],
-          'size' => $_FILES[$this->activeForm->requestFormName]['size'][$this->modelName][$this->colName],
-          'error' => $_FILES[$this->activeForm->requestFormName]['error'][$this->modelName][$this->colName],
-              ], [
-          'upload_code' => 'activeForm:' . $this->activeForm->modelName . ':' . $this->activeForm->model->pk()
-      ]);
+        $file_id = \App::$primary->files->upload([
+            'tmp_name' => $_FILES[$this->activeForm->requestFormName]['tmp_name'][$this->modelName][$this->colName],
+            'name' => $_FILES[$this->activeForm->requestFormName]['name'][$this->modelName][$this->colName],
+            'type' => $_FILES[$this->activeForm->requestFormName]['type'][$this->modelName][$this->colName],
+            'size' => $_FILES[$this->activeForm->requestFormName]['size'][$this->modelName][$this->colName],
+            'error' => $_FILES[$this->activeForm->requestFormName]['error'][$this->modelName][$this->colName],
+                ], [
+            'upload_code' => 'activeForm:' . $this->activeForm->modelName . ':' . $this->activeForm->model->pk()
+        ]);
 
-      if ($file_id) {
+        if ($file_id) {
         $this->activeForm->model->{$this->colName} = $file_id;
-      }
+        }
+    }
     }
-  }
 
 }

system/modules/Ui/objects/ActiveForm.php

Indentation +156 added lines, -156 removed lines

@@ -13,118 +13,118 @@ 
 
 class ActiveForm extends \Object {
 
-  public $model = null;
-  public $modelName = '';
-  public $header = "";
-  public $action = "";
-  public $form = [];
-  public $inputs = [];
-  public $formName = 'noNameForm';
-  public $requestFormName = '';
-  public $requestFullFormName = '';
-  public $parent = null;
+    public $model = null;
+    public $modelName = '';
+    public $header = "";
+    public $action = "";
+    public $form = [];
+    public $inputs = [];
+    public $formName = 'noNameForm';
+    public $requestFormName = '';
+    public $requestFullFormName = '';
+    public $parent = null;
 
-  /**
-   * 
-   * @param array|\Model $model
-   * @param array|string $form
-   */
-  public function __construct($model, $form = '') {
+    /**
+     * 
+     * @param array|\Model $model
+     * @param array|string $form
+     */
+    public function __construct($model, $form = '') {
     if (is_array($model)) {
-      $this->form = $model;
-      if (is_string($form)) {
+        $this->form = $model;
+        if (is_string($form)) {
         $this->formName = $form;
-      }
+        }
     } else {
-      $this->model = $model;
-      $this->modelName = get_class($model);
-      if (is_array($form)) {
+        $this->model = $model;
+        $this->modelName = get_class($model);
+        if (is_array($form)) {
         if (empty($form)) {
-          throw new \Exception('empty form');
+            throw new \Exception('empty form');
         }
         $this->form = $form;
-      } else {
+        } else {
         $this->formName = $form;
         $this->form = \App::$cur->ui->getModelForm($this->modelName, $form);
         if (empty($this->form)) {
-          throw new \Exception('empty form ' . $form);
+            throw new \Exception('empty form ' . $form);
         }
         $this->inputs = $this->getInputs();
-      }
+        }
     }
     $this->requestFormName = "ActiveForm_{$this->formName}";
     $modeName = $this->modelName;
 
     if (!empty($this->form['name'])) {
-      $this->header = $this->form['name'];
+        $this->header = $this->form['name'];
     } elseif (!empty($modeName::$objectName)) {
-      $this->header = $modeName::$objectName;
+        $this->header = $modeName::$objectName;
     } else {
-      $this->header = $this->modelName;
+        $this->header = $this->modelName;
+    }
     }
-  }
 
-  public function getInputs() {
+    public function getInputs() {
     $inputs = !empty($this->form['inputs']) ? $this->form['inputs'] : [];
     $modelName = $this->modelName;
     foreach ($this->form['map'] as $row) {
-      foreach ($row as $col) {
+        foreach ($row as $col) {
         if (!$col || !empty($inputs[$col])) {
-          continue;
+            continue;
         }
         if (strpos($col, 'form:') === 0) {
-          $colPath = explode(':', $col);
-          if ($this->model->{$colPath[1]}) {
+            $colPath = explode(':', $col);
+            if ($this->model->{$colPath[1]}) {
             $inputs[$col] = new ActiveForm($this->model->{$colPath[1]}, $colPath[2]);
-          } else {
+            } else {
             $relOptions = $modelName::getRelation($colPath[1]);
             if (!isset($this->model->_params[$modelName::index()])) {
-              $this->model->_params[$modelName::index()] = 0;
+                $this->model->_params[$modelName::index()] = 0;
             }
             $relOptions['model']::fixPrefix($relOptions['col']);
             $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
-          }
-          $inputs[$col]->parent = $this;
+            }
+            $inputs[$col]->parent = $this;
         } elseif (!empty($modelName::$cols[$col])) {
-          $inputs[$col] = $modelName::$cols[$col];
+            $inputs[$col] = $modelName::$cols[$col];
+        }
         }
-      }
     }
     return $inputs;
-  }
+    }
 
-  public function checkRequest($params = [], $ajax = false) {
+    public function checkRequest($params = [], $ajax = false) {
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->formName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->formName . '"');
+        return [];
     }
     $successId = 0;
     if (!empty($_POST[$this->requestFormName][$this->modelName]) || !empty($_FILES[$this->requestFormName]['tmp_name'][$this->modelName])) {
-      $request = !empty($_POST[$this->requestFormName][$this->modelName])?$_POST[$this->requestFormName][$this->modelName]:[];
-      if ($this->model) {
+        $request = !empty($_POST[$this->requestFormName][$this->modelName])?$_POST[$this->requestFormName][$this->modelName]:[];
+        if ($this->model) {
         if (!empty($this->form['handler'])) {
-          $modelName = $this->model;
-          $modelName::{$this->form['handler']}($request);
-          $text = 'Новый элемент был успешно добавлен';
-          \Msg::add($text, 'success');
-          \Msg::show();
+            $modelName = $this->model;
+            $modelName::{$this->form['handler']}($request);
+            $text = 'Новый элемент был успешно добавлен';
+            \Msg::add($text, 'success');
+            \Msg::show();
         } else {
-          $presets = !empty($this->form['preset']) ? $this->form['preset'] : [];
-          if (!empty($this->form['userGroupPreset'][\Users\User::$cur->group_id])) {
+            $presets = !empty($this->form['preset']) ? $this->form['preset'] : [];
+            if (!empty($this->form['userGroupPreset'][\Users\User::$cur->group_id])) {
             $presets = array_merge($presets, $this->form['userGroupPreset'][\Users\User::$cur->group_id]);
-          }
-          $afterSave = [];
-          $error = false;
-          foreach ($this->inputs as $col => $param) {
+            }
+            $afterSave = [];
+            $error = false;
+            foreach ($this->inputs as $col => $param) {
             if (!empty($presets[$col])) {
-              continue;
+                continue;
             }
             if (is_object($param)) {
-              $afterSave[] = $param;
-              continue;
+                $afterSave[] = $param;
+                continue;
             }
             if (!empty($this->form['userGroupReadonly'][\Users\User::$cur->group_id]) && in_array($col, $this->form['userGroupReadonly'][\Users\User::$cur->group_id])) {
-              continue;
+                continue;
             }
             $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($param['type']);
             $input = new $inputClassName();
@@ -134,189 +134,189 @@ 
             $input->colName = $col;
             $input->colParams = $param;
             try {
-              $input->validate($request);
-              $input->parseRequest($request);
+                $input->validate($request);
+                $input->parseRequest($request);
             } catch (\Exception $exc) {
-              \Msg::add($exc->getMessage(), 'danger');
-              $error = true;
+                \Msg::add($exc->getMessage(), 'danger');
+                $error = true;
+            }
             }
-          }
-          if (!$error && empty($_GET['notSave'])) {
+            if (!$error && empty($_GET['notSave'])) {
             foreach ($presets as $col => $preset) {
-              if (!empty($preset['value'])) {
+                if (!empty($preset['value'])) {
                 $this->model->$col = $preset['value'];
-              } elseif (!empty($preset['userCol'])) {
+                } elseif (!empty($preset['userCol'])) {
                 if (strpos($preset['userCol'], ':')) {
-                  $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
-                  $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);
-                  $this->model->$col = \Users\User::$cur->$rel->$param;
+                    $rel = substr($preset['userCol'], 0, strpos($preset['userCol'], ':'));
+                    $param = substr($preset['userCol'], strpos($preset['userCol'], ':') + 1);
+                    $this->model->$col = \Users\User::$cur->$rel->$param;
                 } else {
-                  $this->model->$col = \Users\User::$cur->{$preset['userCol']};
+                    $this->model->$col = \Users\User::$cur->{$preset['userCol']};
+                }
                 }
-              }
             }
             if (!$this->parent) {
-              if (!empty($this->form['successText'])) {
+                if (!empty($this->form['successText'])) {
                 $text = $this->form['successText'];
-              } else {
+                } else {
                 $text = $this->model->pk() ? 'Изменения были успешно сохранены' : 'Новый элемент был успешно добавлен';
-              }
-              \Msg::add($text, 'success');
+                }
+                \Msg::add($text, 'success');
             }
 
             $this->model->save(!empty($params['dataManagerParams']) ? $params['dataManagerParams'] : []);
             foreach ($afterSave as $form) {
-              $form->checkRequest();
+                $form->checkRequest();
             }
             if ($ajax) {
-              \Msg::show();
+                \Msg::show();
             } elseif (!empty($_GET['redirectUrl'])) {
-              \Tools::redirect($_GET['redirectUrl'] . (!empty($_GET['dataManagerHash']) ? '#' . $_GET['dataManagerHash'] : ''));
+                \Tools::redirect($_GET['redirectUrl'] . (!empty($_GET['dataManagerHash']) ? '#' . $_GET['dataManagerHash'] : ''));
             }
             $successId = $this->model->pk();
-          }
+            }
+        }
         }
-      }
-      if (!is_array($params) && is_callable($params)) {
+        if (!is_array($params) && is_callable($params)) {
         $params($request);
-      }
+        }
     }
     return $successId;
-  }
+    }
 
-  public function draw($params = [], $ajax = false) {
+    public function draw($params = [], $ajax = false) {
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" form with name: "' . $this->formName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" form with name: "' . $this->formName . '"');
+        return [];
     }
     $form = new Form(!empty($this->form['formOptions']) ? $this->form['formOptions'] : []);
     \App::$cur->view->widget('Ui\ActiveForm', ['form' => $form, 'activeForm' => $this, 'ajax' => $ajax, 'params' => $params]);
-  }
+    }
 
-  public function drawCol($colName, $options, $form, $params = []) {
+    public function drawCol($colName, $options, $form, $params = []) {
     if (is_object($options)) {
-      $options->draw();
+        $options->draw();
     } else {
-      $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
-      $input = new $inputClassName();
-      $input->form = $form;
-      $input->activeForm = $this;
-      $input->activeFormParams = $params;
-      $input->modelName = $this->modelName;
-      $input->colName = $colName;
-      $input->colParams = $options;
-      $input->options = !empty($options['options']) ? $options['options'] : [];
-      $input->draw();
+        $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
+        $input = new $inputClassName();
+        $input->form = $form;
+        $input->activeForm = $this;
+        $input->activeFormParams = $params;
+        $input->modelName = $this->modelName;
+        $input->colName = $colName;
+        $input->colParams = $options;
+        $input->options = !empty($options['options']) ? $options['options'] : [];
+        $input->draw();
     }
     return true;
-  }
+    }
 
-  public static function getOptionsList($inputParams, $params = [], $modelName = '', $aditionalInputNamePrefix = 'aditional', $options = []) {
+    public static function getOptionsList($inputParams, $params = [], $modelName = '', $aditionalInputNamePrefix = 'aditional', $options = []) {
     $values = [];
     switch ($inputParams['source']) {
-      case 'model':
+        case 'model':
         $values = $inputParams['model']::getList(['forSelect' => true]);
         break;
-      case 'array':
+        case 'array':
         $values = $inputParams['sourceArray'];
         break;
-      case 'method':
+        case 'method':
         if (!empty($inputParams['params'])) {
-          $values = call_user_func_array([\App::$cur->$inputParams['module'], $inputParams['method']], $inputParams['params']);
+            $values = call_user_func_array([\App::$cur->$inputParams['module'], $inputParams['method']], $inputParams['params']);
         } else {
-          $values = \App::$cur->$inputParams['module']->$inputParams['method']();
+            $values = \App::$cur->$inputParams['module']->$inputParams['method']();
         }
         break;
-      case 'relation':
+        case 'relation':
         if (!$modelName) {
-          return [];
+            return [];
         }
         $relation = $modelName::getRelation($inputParams['relation']);
         if (!empty($params['dataManagerParams']['appType'])) {
-          $options['appType'] = $params['dataManagerParams']['appType'];
+            $options['appType'] = $params['dataManagerParams']['appType'];
         }
         $items = [];
         if (class_exists($relation['model'])) {
-          $filters = $relation['model']::managerFilters();
-          if (!empty($filters['getRows']['where'])) {
+            $filters = $relation['model']::managerFilters();
+            if (!empty($filters['getRows']['where'])) {
             $options['where'][] = $filters['getRows']['where'];
-          }
-          if (!empty($relation['where'])) {
+            }
+            if (!empty($relation['where'])) {
             $options['where'][] = $relation['where'];
-          }
-          if (!empty($relation['order'])) {
+            }
+            if (!empty($relation['order'])) {
             $options['order'] = $relation['order'];
-          }
-          if (!empty($inputParams['itemName'])) {
+            }
+            if (!empty($inputParams['itemName'])) {
             $options['itemName'] = $inputParams['itemName'];
-          }
-          $items = $relation['model']::getList($options);
+            }
+            $items = $relation['model']::getList($options);
         }
         if (!empty($params['noEmptyValue'])) {
-          $values = [];
+            $values = [];
         } else {
-          $values = [0 => 'Не задано'];
+            $values = [0 => 'Не задано'];
         }
         foreach ($items as $key => $item) {
-          if (!empty($inputParams['showCol'])) {
+            if (!empty($inputParams['showCol'])) {
             if (is_array($inputParams['showCol'])) {
-              switch ($inputParams['showCol']['type']) {
+                switch ($inputParams['showCol']['type']) {
                 case 'staticMethod':
                   $values[$key] = $inputParams['showCol']['class']::{$inputParams['showCol']['method']}($item);
-                  break;
-              }
+                    break;
+                }
             } else {
-              $values[$key] = $item->$inputParams['showCol'];
+                $values[$key] = $item->$inputParams['showCol'];
             }
-          } else {
+            } else {
             $values[$key] = $item->name();
-          }
+            }
         }
         break;
     }
     foreach ($values as $key => $value) {
-      if (is_array($value) && !empty($value['input']) && empty($value['input']['noprefix'])) {
+        if (is_array($value) && !empty($value['input']) && empty($value['input']['noprefix'])) {
         $values[$key]['input']['name'] = $aditionalInputNamePrefix . "[{$value['input']['name']}]";
-      }
+        }
     }
     return $values;
-  }
+    }
 
-  /**
-   * Draw error message
-   * 
-   * @param string $errorText
-   */
-  public function drawError($errorText) {
+    /**
+     * Draw error message
+     * 
+     * @param string $errorText
+     */
+    public function drawError($errorText) {
     echo $errorText;
-  }
+    }
 
-  /**
-   * Check access cur user to form with name in param and $model
-   * 
-   * @return boolean
-   */
-  public function checkAccess() {
+    /**
+     * Check access cur user to form with name in param and $model
+     * 
+     * @return boolean
+     */
+    public function checkAccess() {
     if (empty($this->form)) {
-      $this->drawError('"' . $this->modelName . '" form with name: "' . $this->formName . '" not found');
-      return false;
+        $this->drawError('"' . $this->modelName . '" form with name: "' . $this->formName . '" not found');
+        return false;
     }
     if (\App::$cur->Access && !\App::$cur->Access->checkAccess($this)) {
-      return false;
+        return false;
     }
     if (!empty($this->form['options']['access']['apps']) && !in_array(\App::$cur->name, $this->form['options']['access']['apps'])) {
-      return false;
+        return false;
     }
     if (!empty($this->form['options']['access']['groups']) && in_array(\Users\User::$cur->group_id, $this->form['options']['access']['groups'])) {
-      return true;
+        return true;
     }
     if ($this->model && !empty($this->form['options']['access']['self']) && \Users\User::$cur->id == $this->model->user_id) {
-      return true;
+        return true;
     }
     if ($this->formName == 'manager' && !\Users\User::$cur->isAdmin()) {
-      return false;
+        return false;
     }
     return true;
-  }
+    }
 
 }

system/modules/Ui/objects/DataManager.php

Indentation +311 added lines, -311 removed lines

@@ -12,61 +12,61 @@ 
 
 class DataManager extends \Object {
 
-  public $modelName = '';
-  public $managerOptions = [];
-  public $managerName = 'customManager';
-  public $name = 'Менеджер данных';
-  public $limit = 30;
-  public $page = 1;
-  public $table = null;
-  public $joins = [];
-  public $predraw = false;
-  public $cols = [];
-  public $managerId = '';
-
-  /**
-   * Construct new data manager
-   * 
-   * @param string|array $modelNameOrOptions
-   * @param string $managerName
-   * @throws Exception
-   */
-  public function __construct($modelNameOrOptions, $managerName = 'manager') {
+    public $modelName = '';
+    public $managerOptions = [];
+    public $managerName = 'customManager';
+    public $name = 'Менеджер данных';
+    public $limit = 30;
+    public $page = 1;
+    public $table = null;
+    public $joins = [];
+    public $predraw = false;
+    public $cols = [];
+    public $managerId = '';
+
+    /**
+     * Construct new data manager
+     * 
+     * @param string|array $modelNameOrOptions
+     * @param string $managerName
+     * @throws Exception
+     */
+    public function __construct($modelNameOrOptions, $managerName = 'manager') {
     $this->managerName = $managerName;
 
     if (!is_array($modelNameOrOptions)) {
-      if (!class_exists($modelNameOrOptions)) {
+        if (!class_exists($modelNameOrOptions)) {
         throw new \Exception("model {$modelNameOrOptions} not exists");
-      }
-      $this->modelName = $modelNameOrOptions;
-      $this->managerOptions = !empty($modelNameOrOptions::$dataManagers[$managerName]) ? $modelNameOrOptions::$dataManagers[$managerName] : [];
-      if (isset($modelNameOrOptions::$objectName)) {
+        }
+        $this->modelName = $modelNameOrOptions;
+        $this->managerOptions = !empty($modelNameOrOptions::$dataManagers[$managerName]) ? $modelNameOrOptions::$dataManagers[$managerName] : [];
+        if (isset($modelNameOrOptions::$objectName)) {
         $this->name = $modelNameOrOptions::$objectName;
-      } else {
+        } else {
         $this->name = $modelNameOrOptions;
-      }
+        }
     } else {
-      $this->managerOptions = $modelNameOrOptions;
+        $this->managerOptions = $modelNameOrOptions;
     }
 
     if (!$this->managerOptions || !is_array($this->managerOptions)) {
-      throw new \Exception('empty DataManager');
+        throw new \Exception('empty DataManager');
     }
 
     if (!empty($this->managerOptions['name'])) {
-      $this->name = $this->managerOptions['name'];
+        $this->name = $this->managerOptions['name'];
     }
 
     $this->managerId = str_replace('\\', '_', 'dataManager_' . $this->modelName . '_' . $this->managerName . '_' . \Tools::randomString());
-  }
-
-  /**
-   * Get buttons for manager
-   * 
-   * @param string $params
-   * @param object $model
-   */
-  public function getButtons($params = [], $model = null) {
+    }
+
+    /**
+     * Get buttons for manager
+     * 
+     * @param string $params
+     * @param object $model
+     */
+    public function getButtons($params = [], $model = null) {
     $modelName = $this->modelName;
 
 
@@ -76,102 +76,102 @@ 
         'formName' => !empty($this->managerOptions['editForm']) ? $this->managerOptions['editForm'] : 'manager'
     ];
     if ($model) {
-      $formModelName = get_class($model);
-      $relations = $formModelName::relations();
-      $type = !empty($relations[$params['relation']]['type']) ? $relations[$params['relation']]['type'] : 'to';
-      switch ($type) {
+        $formModelName = get_class($model);
+        $relations = $formModelName::relations();
+        $type = !empty($relations[$params['relation']]['type']) ? $relations[$params['relation']]['type'] : 'to';
+        switch ($type) {
         case 'relModel':
           $formParams['preset'] = [
-              $formModelName::index() => $model->pk()
-          ];
-          break;
+                $formModelName::index() => $model->pk()
+            ];
+            break;
         default:
           $formParams['preset'] = [
-              $relations[$params['relation']]['col'] => $model->pk()
-          ];
-      }
+                $relations[$params['relation']]['col'] => $model->pk()
+            ];
+        }
     }
 
     $buttons = [];
     if (!empty($this->managerOptions['sortMode'])) {
-      $buttons[] = [
-          'class' => 'modeBtn',
-          'data-mode' => 'sort',
-          'text' => 'Сортировать',
-      ];
+        $buttons[] = [
+            'class' => 'modeBtn',
+            'data-mode' => 'sort',
+            'text' => 'Сортировать',
+        ];
     }
     if (!empty($this->managerOptions['filters'])) {
-      $buttons[] = [
-          'text' => 'Фильтры',
-          'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+        $buttons[] = [
+            'text' => 'Фильтры',
+            'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
                 modal.modal("show");',
-      ];
+        ];
     }
     if (!empty($modelName::$forms['simpleItem'])) {
-      $formParams['formName'] = 'simpleItem';
-      $buttons[] = [
-          'text' => '<i class = "glyphicon glyphicon-send"></i> Быстрое создание',
-          'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
-      ];
+        $formParams['formName'] = 'simpleItem';
+        $buttons[] = [
+            'text' => '<i class = "glyphicon glyphicon-send"></i> Быстрое создание',
+            'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+        ];
     }
     $formParams['formName'] = !empty($this->managerOptions['editForm']) ? $this->managerOptions['editForm'] : 'manager';
     $name = 'Элемент';
     if ($modelName::$objectName) {
-      $name = $modelName::$objectName;
+        $name = $modelName::$objectName;
     }
     if (!empty($modelName::$forms[$formParams['formName']])) {
-      $aform = new ActiveForm(new $modelName, $formParams['formName']);
-      if ($aform->checkAccess()) {
+        $aform = new ActiveForm(new $modelName, $formParams['formName']);
+        if ($aform->checkAccess()) {
         $buttons[] = [
             'text' => 'Создать ' . $name,
             'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
         ];
-      }
+        }
     }
 
     return $buttons;
-  }
+    }
 
-  function getActions($onlyGroupActions = false) {
+    function getActions($onlyGroupActions = false) {
     $actions = [
         'Open' => ['className' => 'Open'], 'Edit' => ['className' => 'Edit'], 'Delete' => ['className' => 'Delete']
     ];
     if (isset($this->managerOptions['actions'])) {
-      $actions = array_merge($actions, $this->managerOptions['actions']);
+        $actions = array_merge($actions, $this->managerOptions['actions']);
     }
     $return = [];
     foreach ($actions as $key => $action) {
-      if ($action === false) {
+        if ($action === false) {
         continue;
-      }
-      if (is_array($action)) {
+        }
+        if (is_array($action)) {
         if (!empty($action['access']['groups']) && !in_array(\Users\User::$cur->group_id, $action['access']['groups'])) {
-          continue;
+            continue;
         }
         if (empty($action['className'])) {
-          $action['className'] = $key;
+            $action['className'] = $key;
         }
         $return[$key] = $action;
-      } else {
+        } else {
         $key = $action;
         $return[$key] = [
             'className' => $action
         ];
-      }
-      $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
-      if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
+        }
+        $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
+        if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
         unset($return[$key]);
-      }
+        }
     }
     return $return;
-  }
-
-  /**
-   * Get cols for manager
-   * 
-   * @return string
-   */
-  public function getCols() {
+    }
+
+    /**
+     * Get cols for manager
+     * 
+     * @return string
+     */
+    public function getCols() {
     $actions = $this->getActions();
     ob_start();
     ?>
@@ -187,12 +187,12 @@ 
         <li><a href ='' onclick='inji.Ui.dataManagers.get(this).rowSelection("inverse");return false;'>Инвертировать</a></li>
         <li role="separator" class="divider"></li>
           <?php
-          foreach ($actions as $action => $actionParams) {
+            foreach ($actions as $action => $actionParams) {
             if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-              echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+                echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+            }
             }
-          }
-          ?>
+            ?>
       </ul>
     </div>
     <?php
@@ -205,284 +205,284 @@ 
 
     $modelName = $this->modelName;
     foreach ($this->managerOptions['cols'] as $key => $col) {
-      if (is_array($col)) {
+        if (is_array($col)) {
         $colName = $key;
         $colOptions = $col;
-      } else {
+        } else {
         $colName = $col;
         $colOptions = [];
-      }
-      $colInfo = [];
-      if ($modelName) {
+        }
+        $colInfo = [];
+        if ($modelName) {
         $colInfo = $modelName::getColInfo($colName);
-      }
-      if (empty($colOptions['label']) && !empty($colInfo['label'])) {
+        }
+        if (empty($colOptions['label']) && !empty($colInfo['label'])) {
         $colOptions['label'] = $colInfo['label'];
-      } elseif (empty($colOptions['label'])) {
+        } elseif (empty($colOptions['label'])) {
         $colOptions['label'] = $colName;
-      }
-      $cols[$colName] = $colOptions;
+        }
+        $cols[$colName] = $colOptions;
     }
     return $cols;
-  }
-
-  /**
-   * Get rows for manager
-   * 
-   * @param array $params
-   * @param object $model
-   * @return type
-   */
-  public function getRows($params = [], $model = null) {
+    }
+
+    /**
+     * Get rows for manager
+     * 
+     * @param array $params
+     * @param object $model
+     * @return type
+     */
+    public function getRows($params = [], $model = null) {
     $modelName = $this->modelName;
     if (!class_exists($modelName)) {
-      return [];
+        return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+        return [];
     }
     $modelName = $this->modelName;
     $queryParams = [];
     if (empty($params['all'])) {
-      if (!empty($params['limit'])) {
+        if (!empty($params['limit'])) {
         $this->limit = (int) $params['limit'];
-      }
-      if (!empty($params['page'])) {
+        }
+        if (!empty($params['page'])) {
         $this->page = (int) $params['page'];
-      }
-      $queryParams['limit'] = $this->limit;
-      $queryParams['start'] = $this->page * $this->limit - $this->limit;
+        }
+        $queryParams['limit'] = $this->limit;
+        $queryParams['start'] = $this->page * $this->limit - $this->limit;
     }
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+        $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
     }
     if (!empty($params['appType'])) {
-      $queryParams['appType'] = $params['appType'];
+        $queryParams['appType'] = $params['appType'];
     }
     if ($this->joins) {
-      $queryParams['joins'] = $this->joins;
+        $queryParams['joins'] = $this->joins;
     }
     if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
-      foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
+        foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
         if (!empty($colOptions['userCol'])) {
-          $queryParams['where'][] = [$colName, \Model::getColValue(\Users\User::$cur, $colOptions['userCol'])];
+            $queryParams['where'][] = [$colName, \Model::getColValue(\Users\User::$cur, $colOptions['userCol'])];
         } elseif (isset($colOptions['value'])) {
-          if (is_array($colOptions['value'])) {
+            if (is_array($colOptions['value'])) {
             foreach ($colOptions['value'] as $key => $value) {
-              if ($key === 'userCol') {
+                if ($key === 'userCol') {
                 $colOptions['value'][$key] = \Model::getColValue(\Users\User::$cur, $value);
-              }
+                }
+            }
             }
-          }
-          $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+            $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+        }
         }
-      }
     }
     if (!empty($this->managerOptions['filters'])) {
-      foreach ($this->managerOptions['filters'] as $col) {
+        foreach ($this->managerOptions['filters'] as $col) {
         $colInfo = $modelName::getColInfo($col);
         switch ($colInfo['colParams']['type']) {
-          case 'select':
+            case 'select':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             if (is_array($params['filters'][$col]['value'])) {
-              foreach ($params['filters'][$col]['value'] as $key => $value) {
+                foreach ($params['filters'][$col]['value'] as $key => $value) {
                 if ($value === '') {
-                  unset($params['filters'][$col]['value'][$key]);
+                    unset($params['filters'][$col]['value'][$key]);
+                }
                 }
-              }
             }
             if (!$params['filters'][$col]['value']) {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, $params['filters'][$col]['value'], is_array($params['filters'][$col]['value']) ? 'IN' : '='];
             break;
-          case 'bool':
+            case 'bool':
 
             if (!isset($params['filters'][$col]['value']) || $params['filters'][$col]['value'] === '') {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
             break;
-          case 'dateTime':
+            case 'dateTime':
           case 'date':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
+                if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
                 $date = $params['filters'][$col]['max'] . ' 23:59:59';
-              } else {
+                } else {
                 $date = $params['filters'][$col]['max'];
-              }
-              $queryParams['where'][] = [$col, $date, '<='];
+                }
+                $queryParams['where'][] = [$col, $date, '<='];
             }
             break;
-          case 'number':
+            case 'number':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
             }
             break;
-          case 'email':
+            case 'email':
           case 'text':
           case 'textarea':
           case 'html':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             switch ($params['filters'][$col]['compareType']) {
-              case 'contains':
+                case 'contains':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'equals':
+                case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
-              case 'starts_with':
+                case 'starts_with':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'ends_with':
+                case 'ends_with':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
         }
-      }
+        }
     }
     if (!empty($params['mode']) && $params['mode'] == 'sort') {
-      $queryParams['order'] = ['weight', 'asc'];
+        $queryParams['order'] = ['weight', 'asc'];
     } elseif (!empty($params['sortered']) && !empty($this->managerOptions['sortable'])) {
-      foreach ($params['sortered'] as $colName => $sortType) {
+        foreach ($params['sortered'] as $colName => $sortType) {
         if ($colName && in_array($colName, $this->managerOptions['sortable'])) {
-          $sortType = in_array($sortType, ['desc', 'asc']) ? $sortType : 'desc';
-          $queryParams['order'][] = [$colName, $sortType];
+            $sortType = in_array($sortType, ['desc', 'asc']) ? $sortType : 'desc';
+            $queryParams['order'][] = [$colName, $sortType];
+        }
         }
-      }
     }
     if ($model && !empty($params['relation'])) {
-      $relation = $model::getRelation($params['relation']);
-      $items = $model->$params['relation']($queryParams);
+        $relation = $model::getRelation($params['relation']);
+        $items = $model->$params['relation']($queryParams);
     } else {
-      $relation = false;
-      $items = $modelName::getList($queryParams);
+        $relation = false;
+        $items = $modelName::getList($queryParams);
     }
     $rows = [];
     foreach ($items as $item) {
-      if ($relation && !empty($relation['relModel'])) {
+        if ($relation && !empty($relation['relModel'])) {
         $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
-      }
-      $row = [];
-      $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
-      $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '%5C', get_class($originalItem));
-      $row[] = "<a href ='/admin/" . $item->genViewLink() . "?redirectUrl={$redirectUrl}'>{$item->pk()}</a>";
-      foreach ($this->managerOptions['cols'] as $key => $colName) {
+        }
+        $row = [];
+        $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
+        $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '%5C', get_class($originalItem));
+        $row[] = "<a href ='/admin/" . $item->genViewLink() . "?redirectUrl={$redirectUrl}'>{$item->pk()}</a>";
+        foreach ($this->managerOptions['cols'] as $key => $colName) {
         if (!empty($params['download'])) {
-          $row[] = \Model::getColValue($item, is_array($colName) ? $key : $colName, true, false);
+            $row[] = \Model::getColValue($item, is_array($colName) ? $key : $colName, true, false);
         } else {
-          $row[] = DataManager::drawCol($item, is_array($colName) ? $key : $colName, $params, $this);
+            $row[] = DataManager::drawCol($item, is_array($colName) ? $key : $colName, $params, $this);
+        }
         }
-      }
-      $row[] = $this->rowButtons($item, $params);
-      $rows[] = $row;
+        $row[] = $this->rowButtons($item, $params);
+        $rows[] = $row;
     }
     return $rows;
-  }
+    }
 
-  public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) {
+    public static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) {
     $modelName = get_class($item);
     if (!class_exists($modelName)) {
-      return false;
+        return false;
     }
 
     if (!$originalCol) {
-      $originalCol = $colName;
+        $originalCol = $colName;
     }
     if (!$originalItem) {
-      $originalItem = $item;
+        $originalItem = $item;
     }
 
     $relations = $modelName::relations();
     if (strpos($colName, ':') !== false && !empty($relations[substr($colName, 0, strpos($colName, ':'))])) {
-      $rel = substr($colName, 0, strpos($colName, ':'));
-      $col = substr($colName, strpos($colName, ':') + 1);
-      if ($item->$rel) {
+        $rel = substr($colName, 0, strpos($colName, ':'));
+        $col = substr($colName, strpos($colName, ':') + 1);
+        if ($item->$rel) {
         return DataManager::drawCol($item->$rel, $col, $params, $dataManager, $originalCol, $originalItem);
-      } else {
+        } else {
         return 'Не указано';
-      }
+        }
     }
     if (!empty($modelName::$cols[$colName]['relation'])) {
-      $type = !empty($relations[$modelName::$cols[$colName]['relation']]['type']) ? $relations[$modelName::$cols[$colName]['relation']]['type'] : 'to';
-      switch ($type) {
+        $type = !empty($relations[$modelName::$cols[$colName]['relation']]['type']) ? $relations[$modelName::$cols[$colName]['relation']]['type'] : 'to';
+        switch ($type) {
         case 'relModel':
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
-          $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-          $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+            $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
+            $count = $count ? $count : 'Нет';
+            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
         case 'many':
           $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
-          $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-          $count = $count ? $count : 'Нет';
-          return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+            $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
+            $count = $count ? $count : 'Нет';
+            return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
         default :
           if ($item->{$modelName::$cols[$colName]['relation']}) {
             if (\App::$cur->name == 'admin') {
-              $href = "<a href ='/admin/" . $item->{$modelName::$cols[$colName]['relation']}->genViewLink() . "'>";
-              if (!empty($modelName::$cols[$colName]['showCol'])) {
+                $href = "<a href ='/admin/" . $item->{$modelName::$cols[$colName]['relation']}->genViewLink() . "'>";
+                if (!empty($modelName::$cols[$colName]['showCol'])) {
                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
-              } else {
+                } else {
 
                 $href .= $item->{$modelName::$cols[$colName]['relation']}->name();
-              }
-              $href .= '</a>';
-              return $href;
+                }
+                $href .= '</a>';
+                return $href;
             } else {
-              return $item->{$modelName::$cols[$colName]['relation']}->name();
+                return $item->{$modelName::$cols[$colName]['relation']}->name();
             }
-          } else {
+            } else {
             return $item->$colName;
-          }
-      }
+            }
+        }
     } else {
-      if (!empty($modelName::$cols[$colName]['view']['type'])) {
+        if (!empty($modelName::$cols[$colName]['view']['type'])) {
         switch ($modelName::$cols[$colName]['view']['type']) {
-          case 'widget':
+            case 'widget':
             ob_start();
             \App::$cur->view->widget($modelName::$cols[$colName]['view']['widget'], ['item' => $item, 'colName' => $colName, 'colParams' => $modelName::$cols[$colName]]);
             $content = ob_get_contents();
             ob_end_clean();
             return $content;
-          case 'moduleMethod':
+            case 'moduleMethod':
             return \App::$cur->{$modelName::$cols[$colName]['view']['module']}->{$modelName::$cols[$colName]['view']['method']}($item, $colName, $modelName::$cols[$colName]);
-          case 'many':
+            case 'many':
             $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
             $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
             return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count} " . \Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']) . "</a>";
-          default:
+            default:
             return $item->$colName;
         }
-      } elseif (!empty($modelName::$cols[$colName]['type'])) {
+        } elseif (!empty($modelName::$cols[$colName]['type'])) {
         if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
-          $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
-          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-          return "<a href ='/admin/{$originalItem->genViewLink()}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+            $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
+            $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
+            return "<a href ='/admin/{$originalItem->genViewLink()}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
         } elseif (\App::$cur->name == 'admin' && $colName == 'name') {
-          $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-          return "<a href ='/admin/{$item->genViewLink()}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+            $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
+            return "<a href ='/admin/{$item->genViewLink()}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
         } elseif ($modelName::$cols[$colName]['type'] == 'html') {
-          $uid = \Tools::randomString();
-          $script = "<script>inji.onLoad(function(){
+            $uid = \Tools::randomString();
+            $script = "<script>inji.onLoad(function(){
             var el{$uid}=$('#{$uid}');
             var height{$uid} = el{$uid}.height();
             el{$uid}.css('maxHeight','none');
@@ -508,20 +508,20 @@ 
               el{$uid}.after('<a href=\"#\" onclick=\"el{$uid}Toggle();return false;\">Развернуть</a>');
             }
             })</script>";
-          return "<div id = '{$uid}' style='max-height:44px;overflow:hidden;'>{$item->$colName}</div>" . $script;
+            return "<div id = '{$uid}' style='max-height:44px;overflow:hidden;'>{$item->$colName}</div>" . $script;
         } else {
-          return \Model::resloveTypeValue($item, $colName);
+            return \Model::resloveTypeValue($item, $colName);
         }
-      } else {
+        } else {
         return $item->$colName;
-      }
+        }
+    }
     }
-  }
 
-  public function rowButtons($item, $params) {
+    public function rowButtons($item, $params) {
     $modelName = $this->modelName;
     if (!class_exists($modelName)) {
-      return false;
+        return false;
     }
     ob_start();
     $widgetName = !empty($this->managerOptions['rowButtonsWidget']) ? $this->managerOptions['rowButtonsWidget'] : 'Ui\DataManager/rowButtons';
@@ -533,132 +533,132 @@ 
     $buttons = ob_get_contents();
     ob_end_clean();
     return $buttons;
-  }
+    }
 
-  public function getPages($params = [], $model = null) {
+    public function getPages($params = [], $model = null) {
     $modelName = $this->modelName;
     if (!class_exists($modelName)) {
-      return [];
+        return [];
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+        return [];
     }
     if (!empty($params['limit'])) {
-      $this->limit = (int) $params['limit'];
+        $this->limit = (int) $params['limit'];
     }
     if (!empty($params['page'])) {
-      $this->page = (int) $params['page'];
+        $this->page = (int) $params['page'];
     }
     $queryParams = [
         'count' => true
     ];
     $modelName = $this->modelName;
     if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-      $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+        $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
     }
     if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
-      foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
+        foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
         if (!empty($colOptions['userCol'])) {
-          $queryParams['where'][] = [$colName, \Model::getColValue(\Users\User::$cur, $colOptions['userCol'])];
+            $queryParams['where'][] = [$colName, \Model::getColValue(\Users\User::$cur, $colOptions['userCol'])];
         } elseif (isset($colOptions['value'])) {
-          if (is_array($colOptions['value'])) {
+            if (is_array($colOptions['value'])) {
             foreach ($colOptions['value'] as $key => $value) {
-              if ($key === 'userCol') {
+                if ($key === 'userCol') {
                 $colOptions['value'][$key] = \Model::getColValue(\Users\User::$cur, $value);
-              }
+                }
             }
-          }
-          $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+            }
+            $queryParams['where'][] = [$colName, $colOptions['value'], is_array($colOptions['value']) ? 'IN' : '='];
+        }
         }
-      }
     }
     $modelName = $this->modelName;
     if (!empty($this->managerOptions['filters'])) {
-      foreach ($this->managerOptions['filters'] as $col) {
+        foreach ($this->managerOptions['filters'] as $col) {
         $colInfo = $modelName::getColInfo($col);
         switch ($colInfo['colParams']['type']) {
-          case 'select':
+            case 'select':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             if (is_array($params['filters'][$col]['value'])) {
-              foreach ($params['filters'][$col]['value'] as $key => $value) {
+                foreach ($params['filters'][$col]['value'] as $key => $value) {
                 if ($value === '') {
-                  unset($params['filters'][$col]['value'][$key]);
+                    unset($params['filters'][$col]['value'][$key]);
+                }
                 }
-              }
             }
             if (!$params['filters'][$col]['value']) {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, $params['filters'][$col]['value'], is_array($params['filters'][$col]['value']) ? 'IN' : '='];
             break;
-          case 'bool':
+            case 'bool':
 
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             $queryParams['where'][] = [$col, '1'];
             break;
-          case 'dateTime':
+            case 'dateTime':
           case 'date':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
+                if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
                 $date = $params['filters'][$col]['max'] . ' 23:59:59';
-              } else {
+                } else {
                 $date = $params['filters'][$col]['max'];
-              }
-              $queryParams['where'][] = [$col, $date, '<='];
+                }
+                $queryParams['where'][] = [$col, $date, '<='];
             }
             break;
-          case 'number':
+            case 'number':
             if (empty($params['filters'][$col]['min']) && empty($params['filters'][$col]['max'])) {
-              continue;
+                continue;
             }
             if (!empty($params['filters'][$col]['min'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['min'], '>='];
             }
             if (!empty($params['filters'][$col]['max'])) {
-              $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
+                $queryParams['where'][] = [$col, $params['filters'][$col]['max'], '<='];
             }
             break;
-          case 'email':
+            case 'email':
           case 'text':
           case 'textarea':
           case 'html':
             if (empty($params['filters'][$col]['value'])) {
-              continue;
+                continue;
             }
             switch ($params['filters'][$col]['compareType']) {
-              case 'contains':
+                case 'contains':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'equals':
+                case 'equals':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                 break;
-              case 'starts_with':
+                case 'starts_with':
                 $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
                 break;
-              case 'ends_with':
+                case 'ends_with':
                 $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
                 break;
             }
             break;
         }
-      }
+        }
     }
     if ($model && !empty($params['relation'])) {
-      $count = $model->$params['relation']($queryParams);
+        $count = $model->$params['relation']($queryParams);
     } else {
-      $count = $modelName::getCount($queryParams);
+        $count = $modelName::getCount($queryParams);
     }
     $pages = new Pages([
         'limit' => $this->limit,
@@ -668,9 +668,9 @@ 
         'dataManager' => $this
     ]);
     return $pages;
-  }
+    }
 
-  public function preDraw($params = [], $model = null) {
+    public function preDraw($params = [], $model = null) {
     $this->predraw = true;
 
     $cols = $this->getCols();
@@ -678,19 +678,19 @@ 
     $this->table = new Table();
     $tableCols = [];
     foreach ($cols as $colName => $colOptions) {
-      $tableCols[] = [
-          'attributes' => ['class' => $this->managerId . '_colname_' . $colName, 'data-colname' => $colName],
-          'text' => !empty($colOptions['label']) ? $colOptions['label'] : $colName
-      ];
+        $tableCols[] = [
+            'attributes' => ['class' => $this->managerId . '_colname_' . $colName, 'data-colname' => $colName],
+            'text' => !empty($colOptions['label']) ? $colOptions['label'] : $colName
+        ];
     }
     $tableCols[] = '';
     $this->table->class .=' datamanagertable';
     $this->table->setCols($tableCols);
-  }
+    }
 
-  public function draw($params = [], $model = null) {
+    public function draw($params = [], $model = null) {
     if (!$this->predraw) {
-      $this->preDraw($params, $model);
+        $this->preDraw($params, $model);
     }
     \App::$cur->view->widget('Ui\DataManager/DataManager', [
         'dataManager' => $this,
@@ -698,58 +698,58 @@ 
         'table' => $this->table,
         'params' => $params
     ]);
-  }
+    }
 
-  public function drawCategorys() {
+    public function drawCategorys() {
     if (!class_exists($this->modelName)) {
-      return false;
+        return false;
     }
     if (!$this->checkAccess()) {
-      $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
-      return [];
+        $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+        return [];
     }
     $tree = new Tree();
     $tree->ul($this->managerOptions['categorys']['model'], 0, function($category) {
-      $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
-      $cleanClassName = str_replace('\\', '\\\\', get_class($category));
-      return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a> 
+        $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
+        $cleanClassName = str_replace('\\', '\\\\', get_class($category));
+        return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a> 
                 
                     <a href = '#' class ='glyphicon glyphicon-edit'   onclick = 'inji.Ui.forms.popUp(\"{$cleanClassName}:{$category->pk()}\")'></a>&nbsp;
                     <a href = '#' class ='glyphicon glyphicon-remove' onclick = 'inji.Ui.dataManagers.get(this).delCategory({$category->pk()});return false;'></a>";
     });
     ?>
     <?php
-  }
-
-  /**
-   * Draw error message
-   * 
-   * @param string $errorText
-   */
-  public function drawError($errorText) {
+    }
+
+    /**
+     * Draw error message
+     * 
+     * @param string $errorText
+     */
+    public function drawError($errorText) {
     echo $errorText;
-  }
-
-  /**
-   * Check access cur user to manager with name in param
-   * 
-   * @return boolean
-   */
-  public function checkAccess() {
+    }
+
+    /**
+     * Check access cur user to manager with name in param
+     * 
+     * @return boolean
+     */
+    public function checkAccess() {
     if (\App::$cur->Access && !\App::$cur->Access->checkAccess($this)) {
-      return false;
+        return false;
     }
 
     if (!empty($this->managerOptions['options']['access']['apps']) && !in_array(\App::$cur->name, $this->managerOptions['options']['access']['apps'])) {
-      return false;
+        return false;
     }
     if (!empty($this->managerOptions['options']['access']['groups']) && in_array(\Users\User::$cur->group_id, $this->managerOptions['options']['access']['groups'])) {
-      return true;
+        return true;
     }
     if ($this->managerName == 'manager' && !\Users\User::$cur->isAdmin()) {
-      return false;
+        return false;
     }
     return true;
-  }
+    }
 
 }