injitools /
cms-Inji
@@ -35,11 +35,11 @@ discard block |
||
| 35 | 35 | ?> |
| 36 | 36 | <div> |
| 37 | 37 | <h3>Комментарии (<?= |
| 38 | - \Dashboard\Comment::getCount(['where' => [ |
|
| 39 | - ['item_id', $item->id], |
|
| 40 | - ['model', $modelName], |
|
| 41 | - ]]); |
|
| 42 | - ?>)</h3> |
|
| 38 | + \Dashboard\Comment::getCount(['where' => [ |
|
| 39 | + ['item_id', $item->id], |
|
| 40 | + ['model', $modelName], |
|
| 41 | + ]]); |
|
| 42 | + ?>)</h3> |
|
| 43 | 43 | <?php |
| 44 | 44 | foreach (\Dashboard\Comment::getList([ 'where' => [ |
| 45 | 45 | ['item_id', $item->id], |
@@ -61,11 +61,11 @@ discard block |
||
| 61 | 61 | </div> |
| 62 | 62 | <div> |
| 63 | 63 | <?php |
| 64 | - $form = new \Ui\Form(); |
|
| 65 | - $form->begin('Оставить комментарий'); |
|
| 66 | - $form->input('textarea', 'comment', 'Комментарий'); |
|
| 67 | - $form->end(); |
|
| 68 | - ?> |
|
| 64 | + $form = new \Ui\Form(); |
|
| 65 | + $form->begin('Оставить комментарий'); |
|
| 66 | + $form->input('textarea', 'comment', 'Комментарий'); |
|
| 67 | + $form->end(); |
|
| 68 | + ?> |
|
| 69 | 69 | </div> |
| 70 | 70 | <div> |
| 71 | 71 | <h1>Хронология</h1> |
@@ -8,110 +8,110 @@ discard block |
||
| 8 | 8 | return false;"> |
| 9 | 9 | <div class="row"> |
| 10 | 10 | <?php |
| 11 | - $i = -1; |
|
| 12 | - $form = new Ui\Form(); |
|
| 13 | - foreach ($dataManager->managerOptions['filters'] as $col) { |
|
| 11 | + $i = -1; |
|
| 12 | + $form = new Ui\Form(); |
|
| 13 | + foreach ($dataManager->managerOptions['filters'] as $col) { |
|
| 14 | 14 | |
| 15 | - if ($dataManager->modelName) { |
|
| 16 | - $modelName = $dataManager->modelName; |
|
| 17 | - $colInfo = $modelName::getColInfo($col); |
|
| 18 | - } else { |
|
| 19 | - $colInfo = $dataManager->managerOptions['cols'][$col]; |
|
| 20 | - } |
|
| 21 | - $values = []; |
|
| 22 | - $inputOptions = []; |
|
| 23 | - if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) { |
|
| 24 | - $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col]; |
|
| 25 | - if (!empty($colOptions['userCol'])) { |
|
| 26 | - if (strpos($colOptions['userCol'], ':')) { |
|
| 27 | - $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':')); |
|
| 28 | - $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1); |
|
| 15 | + if ($dataManager->modelName) { |
|
| 16 | + $modelName = $dataManager->modelName; |
|
| 17 | + $colInfo = $modelName::getColInfo($col); |
|
| 18 | + } else { |
|
| 19 | + $colInfo = $dataManager->managerOptions['cols'][$col]; |
|
| 20 | + } |
|
| 21 | + $values = []; |
|
| 22 | + $inputOptions = []; |
|
| 23 | + if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) { |
|
| 24 | + $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col]; |
|
| 25 | + if (!empty($colOptions['userCol'])) { |
|
| 26 | + if (strpos($colOptions['userCol'], ':')) { |
|
| 27 | + $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':')); |
|
| 28 | + $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1); |
|
| 29 | 29 | |
| 30 | - $inputOptions['value'] = \Users\User::$cur->$rel->$param; |
|
| 31 | - } else { |
|
| 32 | - $this->model->$col = \Users\User::$cur->{$preset['userCol']}; |
|
| 33 | - } |
|
| 34 | - } elseif (!empty($colOptions['value'])) { |
|
| 35 | - $inputOptions['value'] = $colOptions['value']; |
|
| 36 | - } |
|
| 37 | - if (is_array($inputOptions['value'])) { |
|
| 38 | - $values = $inputOptions['value']; |
|
| 39 | - foreach ($values as $key => $value) { |
|
| 40 | - $inputOptions['value'] = $value; |
|
| 41 | - $form->input('hidden', "datamanagerFilters[{$col}][value][{$key}]", '', $inputOptions); |
|
| 42 | - } |
|
| 43 | - } else { |
|
| 44 | - $form->input('hidden', "datamanagerFilters[{$col}][value]", '', $inputOptions); |
|
| 45 | - } |
|
| 46 | - continue; |
|
| 47 | - } |
|
| 48 | - if (++$i && !($i % 2)) { |
|
| 49 | - echo '</div><div class="row">'; |
|
| 50 | - } |
|
| 51 | - echo '<div class="col-md-6">'; |
|
| 52 | - if (!empty($colInfo['colParams']['type'])) { |
|
| 53 | - switch ($colInfo['colParams']['type']) { |
|
| 54 | - case'select': |
|
| 30 | + $inputOptions['value'] = \Users\User::$cur->$rel->$param; |
|
| 31 | + } else { |
|
| 32 | + $this->model->$col = \Users\User::$cur->{$preset['userCol']}; |
|
| 33 | + } |
|
| 34 | + } elseif (!empty($colOptions['value'])) { |
|
| 35 | + $inputOptions['value'] = $colOptions['value']; |
|
| 36 | + } |
|
| 37 | + if (is_array($inputOptions['value'])) { |
|
| 38 | + $values = $inputOptions['value']; |
|
| 39 | + foreach ($values as $key => $value) { |
|
| 40 | + $inputOptions['value'] = $value; |
|
| 41 | + $form->input('hidden', "datamanagerFilters[{$col}][value][{$key}]", '', $inputOptions); |
|
| 42 | + } |
|
| 43 | + } else { |
|
| 44 | + $form->input('hidden', "datamanagerFilters[{$col}][value]", '', $inputOptions); |
|
| 45 | + } |
|
| 46 | + continue; |
|
| 47 | + } |
|
| 48 | + if (++$i && !($i % 2)) { |
|
| 49 | + echo '</div><div class="row">'; |
|
| 50 | + } |
|
| 51 | + echo '<div class="col-md-6">'; |
|
| 52 | + if (!empty($colInfo['colParams']['type'])) { |
|
| 53 | + switch ($colInfo['colParams']['type']) { |
|
| 54 | + case'select': |
|
| 55 | 55 | switch ($colInfo['colParams']['source']) { |
| 56 | - case 'array': |
|
| 56 | + case 'array': |
|
| 57 | 57 | $values = ['' => 'Не важно'] + $colInfo['colParams']['sourceArray']; |
| 58 | - break; |
|
| 59 | - case 'method': |
|
| 58 | + break; |
|
| 59 | + case 'method': |
|
| 60 | 60 | if (!empty($colInfo['colParams']['params'])) { |
| 61 | - $values = call_user_func_array([App::$cur->$colInfo['colParams']['module'], $colInfo['colParams']['method']], $colInfo['colParams']['params']); |
|
| 62 | - } else { |
|
| 63 | - $values = ['' => 'Не важно'] + App::$cur->$colInfo['colParams']['module']->$colInfo['colParams']['method'](); |
|
| 64 | - } |
|
| 65 | - break; |
|
| 66 | - case 'model': |
|
| 61 | + $values = call_user_func_array([App::$cur->$colInfo['colParams']['module'], $colInfo['colParams']['method']], $colInfo['colParams']['params']); |
|
| 62 | + } else { |
|
| 63 | + $values = ['' => 'Не важно'] + App::$cur->$colInfo['colParams']['module']->$colInfo['colParams']['method'](); |
|
| 64 | + } |
|
| 65 | + break; |
|
| 66 | + case 'model': |
|
| 67 | 67 | $values = ['' => 'Не важно'] + $colInfo['colParams']['model']::getList(['forSelect' => true]); |
| 68 | - break; |
|
| 69 | - case 'relation': |
|
| 68 | + break; |
|
| 69 | + case 'relation': |
|
| 70 | 70 | $relations = $colInfo['modelName']::relations(); |
| 71 | - $filters = $relations[$colInfo['colParams']['relation']]['model']::managerFilters(); |
|
| 72 | - $cols = $relations[$colInfo['colParams']['relation']]['model']::cols(); |
|
| 73 | - $options = [ |
|
| 74 | - 'where' => !empty($filters['getRows']['where']) ? $filters['getRows']['where'] : '' |
|
| 75 | - ]; |
|
| 76 | - if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix() . 'name'])) { |
|
| 77 | - $options['order'] = 'name'; |
|
| 78 | - } |
|
| 79 | - $items = $relations[$colInfo['colParams']['relation']]['model']::getList($options); |
|
| 80 | - $values = ['' => 'Не задано']; |
|
| 81 | - foreach ($items as $key => $item) { |
|
| 82 | - if (!empty($inputParams['showCol'])) { |
|
| 83 | - $values[$key] = $item->$inputParams['showCol']; |
|
| 84 | - } else { |
|
| 85 | - $values[$key] = $item->name(); |
|
| 86 | - } |
|
| 87 | - } |
|
| 88 | - $values; |
|
| 89 | - break; |
|
| 90 | - } |
|
| 91 | - $value = !empty($_GET['datamanagerFilters'][$col]['value']) ? $_GET['datamanagerFilters'][$col]['value'] : (!empty($params['filters'][$col]['value']) ? $params['filters'][$col]['value'] : ''); |
|
| 92 | - $inputOptions = ['value' => $value, 'values' => $values, 'multiple' => true]; |
|
| 93 | - if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) { |
|
| 71 | + $filters = $relations[$colInfo['colParams']['relation']]['model']::managerFilters(); |
|
| 72 | + $cols = $relations[$colInfo['colParams']['relation']]['model']::cols(); |
|
| 73 | + $options = [ |
|
| 74 | + 'where' => !empty($filters['getRows']['where']) ? $filters['getRows']['where'] : '' |
|
| 75 | + ]; |
|
| 76 | + if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix() . 'name'])) { |
|
| 77 | + $options['order'] = 'name'; |
|
| 78 | + } |
|
| 79 | + $items = $relations[$colInfo['colParams']['relation']]['model']::getList($options); |
|
| 80 | + $values = ['' => 'Не задано']; |
|
| 81 | + foreach ($items as $key => $item) { |
|
| 82 | + if (!empty($inputParams['showCol'])) { |
|
| 83 | + $values[$key] = $item->$inputParams['showCol']; |
|
| 84 | + } else { |
|
| 85 | + $values[$key] = $item->name(); |
|
| 86 | + } |
|
| 87 | + } |
|
| 88 | + $values; |
|
| 89 | + break; |
|
| 90 | + } |
|
| 91 | + $value = !empty($_GET['datamanagerFilters'][$col]['value']) ? $_GET['datamanagerFilters'][$col]['value'] : (!empty($params['filters'][$col]['value']) ? $params['filters'][$col]['value'] : ''); |
|
| 92 | + $inputOptions = ['value' => $value, 'values' => $values, 'multiple' => true]; |
|
| 93 | + if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) { |
|
| 94 | 94 | |
| 95 | - $inputOptions['disabled'] = true; |
|
| 96 | - $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col]; |
|
| 97 | - if (!empty($colOptions['userCol'])) { |
|
| 98 | - if (strpos($colOptions['userCol'], ':')) { |
|
| 99 | - $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':')); |
|
| 100 | - $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1); |
|
| 95 | + $inputOptions['disabled'] = true; |
|
| 96 | + $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col]; |
|
| 97 | + if (!empty($colOptions['userCol'])) { |
|
| 98 | + if (strpos($colOptions['userCol'], ':')) { |
|
| 99 | + $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':')); |
|
| 100 | + $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1); |
|
| 101 | 101 | |
| 102 | - $inputOptions['value'] = \Users\User::$cur->$rel->$param; |
|
| 103 | - } else { |
|
| 104 | - $this->model->$col = \Users\User::$cur->{$preset['userCol']}; |
|
| 105 | - } |
|
| 106 | - } elseif (!empty($colOptions['value'])) { |
|
| 102 | + $inputOptions['value'] = \Users\User::$cur->$rel->$param; |
|
| 103 | + } else { |
|
| 104 | + $this->model->$col = \Users\User::$cur->{$preset['userCol']}; |
|
| 105 | + } |
|
| 106 | + } elseif (!empty($colOptions['value'])) { |
|
| 107 | 107 | |
| 108 | - $inputOptions['value'] = $colOptions['value']; |
|
| 109 | - } |
|
| 110 | - } |
|
| 111 | - $inputOptions['class'] = 'input-sm'; |
|
| 112 | - $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions); |
|
| 113 | - break; |
|
| 114 | - case 'email': |
|
| 108 | + $inputOptions['value'] = $colOptions['value']; |
|
| 109 | + } |
|
| 110 | + } |
|
| 111 | + $inputOptions['class'] = 'input-sm'; |
|
| 112 | + $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions); |
|
| 113 | + break; |
|
| 114 | + case 'email': |
|
| 115 | 115 | case 'text': |
| 116 | 116 | case 'textarea': |
| 117 | 117 | case 'html': |
@@ -139,40 +139,40 @@ discard block |
||
| 139 | 139 | ?> |
| 140 | 140 | <div class="filter_form_field filter_select"> |
| 141 | 141 | <?php |
| 142 | - if (!empty($_GET['datamanagerFilters'][$col]['value'])) { |
|
| 143 | - $value = 1; |
|
| 144 | - } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) { |
|
| 145 | - $value = 0; |
|
| 146 | - } else { |
|
| 147 | - $value = ''; |
|
| 148 | - } |
|
| 149 | - $inputOptions = ['value' => $value, 'values' => [ |
|
| 150 | - '' => 'Не важно', |
|
| 151 | - '1' => $colInfo['label'], |
|
| 152 | - '0' => 'Нет' |
|
| 153 | - ] |
|
| 154 | - ]; |
|
| 155 | - if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) { |
|
| 142 | + if (!empty($_GET['datamanagerFilters'][$col]['value'])) { |
|
| 143 | + $value = 1; |
|
| 144 | + } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) { |
|
| 145 | + $value = 0; |
|
| 146 | + } else { |
|
| 147 | + $value = ''; |
|
| 148 | + } |
|
| 149 | + $inputOptions = ['value' => $value, 'values' => [ |
|
| 150 | + '' => 'Не важно', |
|
| 151 | + '1' => $colInfo['label'], |
|
| 152 | + '0' => 'Нет' |
|
| 153 | + ] |
|
| 154 | + ]; |
|
| 155 | + if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) { |
|
| 156 | 156 | |
| 157 | - $inputOptions['disabled'] = true; |
|
| 158 | - $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col]; |
|
| 159 | - if (!empty($colOptions['userCol'])) { |
|
| 160 | - if (strpos($colOptions['userCol'], ':')) { |
|
| 161 | - $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':')); |
|
| 162 | - $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1); |
|
| 157 | + $inputOptions['disabled'] = true; |
|
| 158 | + $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col]; |
|
| 159 | + if (!empty($colOptions['userCol'])) { |
|
| 160 | + if (strpos($colOptions['userCol'], ':')) { |
|
| 161 | + $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':')); |
|
| 162 | + $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1); |
|
| 163 | 163 | |
| 164 | - $inputOptions['value'] = \Users\User::$cur->$rel->$param; |
|
| 165 | - } else { |
|
| 166 | - $this->model->$col = \Users\User::$cur->{$preset['userCol']}; |
|
| 167 | - } |
|
| 168 | - } elseif (!empty($colOptions['value'])) { |
|
| 164 | + $inputOptions['value'] = \Users\User::$cur->$rel->$param; |
|
| 165 | + } else { |
|
| 166 | + $this->model->$col = \Users\User::$cur->{$preset['userCol']}; |
|
| 167 | + } |
|
| 168 | + } elseif (!empty($colOptions['value'])) { |
|
| 169 | 169 | |
| 170 | - $inputOptions['value'] = $colOptions['value']; |
|
| 171 | - } |
|
| 172 | - } |
|
| 173 | - $inputOptions['class'] = 'input-sm'; |
|
| 174 | - $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions); |
|
| 175 | - ?> |
|
| 170 | + $inputOptions['value'] = $colOptions['value']; |
|
| 171 | + } |
|
| 172 | + } |
|
| 173 | + $inputOptions['class'] = 'input-sm'; |
|
| 174 | + $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions); |
|
| 175 | + ?> |
|
| 176 | 176 | </div> |
| 177 | 177 | |
| 178 | 178 | <?php |
@@ -217,7 +217,7 @@ |
||
| 217 | 217 | /** |
| 218 | 218 | * Функция возвращает окончание для множественного числа слова на основании числа и массива окончаний |
| 219 | 219 | * @param Integer $number Число на основе которого нужно сформировать окончание |
| 220 | - * @param String[] $endingsArray Массив слов или окончаний для чисел (1, 4, 5), |
|
| 220 | + * @param string[] $endingArray Массив слов или окончаний для чисел (1, 4, 5), |
|
| 221 | 221 | * например ['яблоко', 'яблока', 'яблок'] |
| 222 | 222 | * @return String |
| 223 | 223 | */ |
