libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of http://gitlab.edu.yar.ru/composer/PHP_Library into dev

Browse source
This commit is contained in:
Anatoly 2018-01-15 16:22:56 +03:00
commit e179b580eb
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Controller/Component.php
View file

@ -177,7 +177,7 @@ class Controller_Component
public function setParameters(/*.View_Composite.*/$view) public function setParameters(/*.View_Composite.*/$view)
{ {
$form = new Form_Form(); $form = new Form_Form();
$options = new OptionFactory($this->db); $options = new OptionFactory($this->db, $this->registry);
$settings = $this->getInfo(); $settings = $this->getInfo();
$form->addFieldList($settings['parameter'], $options); $form->addFieldList($settings['parameter'], $options);

9
src/Form/Form.php
View file

@ -190,9 +190,10 @@ class TDateTime extends TInput {
class OptionFactory { class OptionFactory {
public $db; public $db;
public $registry;
function __construct($db) { function __construct($db, $registry = null) {
$this->db = $db; $this->db = $db;
$this->registry = $registry;
} }
function create(TSelect $field, $input) { function create(TSelect $field, $input) {
@ -225,6 +226,10 @@ class OptionFactory {
$field->options = $this->optionsDB($key, $value, $query_result); $field->options = $this->optionsDB($key, $value, $query_result);
} elseif (isset($input['options.pair'])) { } elseif (isset($input['options.pair'])) {
$field->options = $this->optionsPair($input['options.pair']); $field->options = $this->optionsPair($input['options.pair']);
} elseif (isset($input['options.model'])) {
$factory = new Model_Factory($this->db, $this->registry);
$model = $factory->getModel($input['options.model']);
$field->options = $model->getAllAsOptions();
} else { } else {
$field->options = $input['options']; $field->options = $input['options'];
} }