@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | return true; |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | - public static function getOptionsList($inputParams, $params = [], $modelName = '', $aditionalInputNamePrefix = 'aditional', $options = [],$model=false) { |
|
| 251 | + public static function getOptionsList($inputParams, $params = [], $modelName = '', $aditionalInputNamePrefix = 'aditional', $options = [], $model = false) { |
|
| 252 | 252 | $values = []; |
| 253 | 253 | switch ($inputParams['source']) { |
| 254 | 254 | case 'model': |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | break; |
| 260 | 260 | case 'method': |
| 261 | 261 | if (!empty($inputParams['params'])) { |
| 262 | - $values = call_user_func_array([\App::$cur->$inputParams['module'], $inputParams['method']], $inputParams['params']+[$model]); |
|
| 262 | + $values = call_user_func_array([\App::$cur->$inputParams['module'], $inputParams['method']], $inputParams['params'] + [$model]); |
|
| 263 | 263 | } else { |
| 264 | 264 | $values = \App::$cur->$inputParams['module']->$inputParams['method']($model); |
| 265 | 265 | } |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | $inputOptions = [ |
| 22 | 22 | 'value' => $this->value(), |
| 23 | 23 | 'disabled' => $this->readOnly(), |
| 24 | - 'values' => \Ui\ActiveForm::getOptionsList($this->colParams, $this->activeFormParams, !empty($this->modelName) ? $this->modelName : $this->activeForm->modelName, $inputName,[],$this->activeForm->model) |
|
| 24 | + 'values' => \Ui\ActiveForm::getOptionsList($this->colParams, $this->activeFormParams, !empty($this->modelName) ? $this->modelName : $this->activeForm->modelName, $inputName, [], $this->activeForm->model) |
|
| 25 | 25 | ]; |
| 26 | 26 | $modelName = ''; |
| 27 | 27 | |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | $result->content = []; |
| 72 | 72 | $result->send(); |
| 73 | 73 | } |
| 74 | - $list = $activeForm->getOptionsList($inputs[$inputName], ['noEmptyValue' => true], $modelName, 'aditional', $options,$model); |
|
| 74 | + $list = $activeForm->getOptionsList($inputs[$inputName], ['noEmptyValue' => true], $modelName, 'aditional', $options, $model); |
|
| 75 | 75 | $result->content = $list; |
| 76 | 76 | $result->send(); |
| 77 | 77 | } |