@@ -58,7 +58,7 @@ |
||
| 58 | 58 | ]]); |
| 59 | 59 | ?>)</h3> |
| 60 | 60 | <?php |
| 61 | - foreach (\Dashboard\Comment::getList([ 'where' => [ |
|
| 61 | + foreach (\Dashboard\Comment::getList(['where' => [ |
|
| 62 | 62 | ['item_id', $item->id], |
| 63 | 63 | ['model', $modelName], |
| 64 | 64 | ], 'order' => ['date', 'desc']]) as $comment) { |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | $this->model->_params[$modelName::index()] = 0; |
| 74 | 74 | } |
| 75 | 75 | $relOptions['model']::fixPrefix($relOptions['col']); |
| 76 | - $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]); |
|
| 76 | + $inputs[$col] = new ActiveForm(new $relOptions['model']([$relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]); |
|
| 77 | 77 | } |
| 78 | 78 | $inputs[$col]->parent = $this; |
| 79 | 79 | } elseif (!empty($modelName::$cols[$col])) { |
@@ -397,7 +397,7 @@ |
||
| 397 | 397 | return $item->$colName; |
| 398 | 398 | } |
| 399 | 399 | } elseif (!empty($modelName::$cols[$colName]['type'])) { |
| 400 | - if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) { |
|
| 400 | + if (\App::$cur->name == 'admin' && $originalCol == 'name' || ($dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) { |
|
| 401 | 401 | $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager'; |
| 402 | 402 | $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem)); |
| 403 | 403 | return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($originalItem)) . "/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>"; |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | 'style' => '' |
| 23 | 23 | ]; |
| 24 | 24 | if (!empty($dataManager->managerOptions['categorys'])) { |
| 25 | - $mainCol['style'].='margin-left:260px;'; |
|
| 25 | + $mainCol['style'] .= 'margin-left:260px;'; |
|
| 26 | 26 | echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">'; |
| 27 | 27 | $this->widget('Ui\DataManager/categorys', compact('dataManager')); |
| 28 | 28 | echo '</div>'; |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | } |
| 13 | 13 | if ( |
| 14 | 14 | (!is_array($primaryValue) && ($key === $primaryValue || (isset($form->userDataTree[$name]) && $form->userDataTree[$name] === $key))) || |
| 15 | - (is_array($primaryValue) && (in_array($key,$primaryValue) || (isset($form->userDataTree[$name]) && in_array($key,$form->userDataTree[$name])))) |
|
| 15 | + (is_array($primaryValue) && (in_array($key, $primaryValue) || (isset($form->userDataTree[$name]) && in_array($key, $form->userDataTree[$name])))) |
|
| 16 | 16 | ) { |
| 17 | 17 | $selected = ' selected="selected"'; |
| 18 | 18 | } |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | $showedInput = count($aditionalInputs) - 1; |
| 23 | 23 | $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : ''; |
| 24 | 24 | } |
| 25 | - $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>"; |
|
| 25 | + $optionsHtml .= "<option data-aditionalInput='" . (count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>"; |
|
| 26 | 26 | } else { |
| 27 | 27 | $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>"; |
| 28 | 28 | } |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | } |
| 6 | 6 | |
| 7 | 7 | for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) { |
| 8 | - if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
|
| 8 | + if (($i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) { |
|
| 9 | 9 | echo '<li '; |
| 10 | 10 | if ($pagesInstance->params['page'] == $i) |
| 11 | 11 | echo 'class = "active"'; |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | $text = ''; |
| 44 | 44 | foreach ($form->inputs as $input) { |
| 45 | 45 | if (isset($inputs['input' . $input->id])) { |
| 46 | - $text .="<b>{$input->label}:</b> " . htmlspecialchars($inputs['input' . $input->id]) . "<br />"; |
|
| 46 | + $text .= "<b>{$input->label}:</b> " . htmlspecialchars($inputs['input' . $input->id]) . "<br />"; |
|
| 47 | 47 | } |
| 48 | 48 | } |
| 49 | 49 | if ($text) { |
@@ -6,7 +6,7 @@ |
||
| 6 | 6 | <div class="panel-heading">Пользователи</div> |
| 7 | 7 | <div class="panel-body"> |
| 8 | 8 | <p>Всего: <?= Users\User::getCount(); ?></p> |
| 9 | - <p>Новых сегодня: <?= Users\User::getCount(['where'=>['date_create',date('Y-m-d 00:00:00'),'>']]); ?></p>
|
|
| 9 | + <p>Новых сегодня: <?= Users\User::getCount(['where'=>['date_create', date('Y-m-d 00:00:00'), '>']]); ?></p>
|
|
| 10 | 10 | </div> |
| 11 | 11 | <div class="panel-footer"> |
| 12 | 12 | <a href ="/admin/users/User">Управление</a> |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -return function ($step = NULL, $params = []) { |
|
| 3 | +return function($step = NULL, $params = []) { |
|
| 4 | 4 | |
| 5 | 5 | $groups = [ |
| 6 | 6 | [ |