fix to loadChoicesForValues()
This commit is contained in:
parent
0b31960534
commit
1abe7fc673
|
@ -109,7 +109,8 @@ class PropelChoiceLoader implements ChoiceLoaderInterface
|
||||||
// Optimize performance in case we have a single-field identifier
|
// Optimize performance in case we have a single-field identifier
|
||||||
if (!$this->choiceList && $this->identifierAsIndex && current($this->identifier) instanceof ColumnMap) {
|
if (!$this->choiceList && $this->identifierAsIndex && current($this->identifier) instanceof ColumnMap) {
|
||||||
$phpName = current($this->identifier)->getPhpName();
|
$phpName = current($this->identifier)->getPhpName();
|
||||||
$unorderedObjects = $this->query->filterBy($phpName, $values);
|
$query = clone $this->query;
|
||||||
|
$unorderedObjects = $query->filterBy($phpName, $values, \Criteria::IN)->find();
|
||||||
$objectsById = array();
|
$objectsById = array();
|
||||||
$objects = array();
|
$objects = array();
|
||||||
|
|
||||||
|
@ -203,7 +204,7 @@ class PropelChoiceLoader implements ChoiceLoaderInterface
|
||||||
if ($model instanceof \BaseObject) {
|
if ($model instanceof \BaseObject) {
|
||||||
return array($model->getPrimaryKey());
|
return array($model->getPrimaryKey());
|
||||||
}
|
}
|
||||||
|
|
||||||
return $model->getPrimaryKeys();
|
return $model->getPrimaryKeys();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -211,7 +211,6 @@ class ModelType extends AbstractType
|
||||||
$valueProperty = $options['property'];
|
$valueProperty = $options['property'];
|
||||||
/** @var ModelCriteria $query */
|
/** @var ModelCriteria $query */
|
||||||
$query = $options['query'];
|
$query = $options['query'];
|
||||||
//var_dump($query->getTableMap());
|
|
||||||
$getter = 'get' . ucfirst($query->getTableMap()->getColumn($valueProperty)->getPhpName());
|
$getter = 'get' . ucfirst($query->getTableMap()->getColumn($valueProperty)->getPhpName());
|
||||||
|
|
||||||
$choiceLabel = function($choice) use ($getter) {
|
$choiceLabel = function($choice) use ($getter) {
|
||||||
|
@ -240,7 +239,7 @@ class ModelType extends AbstractType
|
||||||
$resolver->setRequired(array('class'));
|
$resolver->setRequired(array('class'));
|
||||||
$resolver->setNormalizer('query', $queryNormalizer);
|
$resolver->setNormalizer('query', $queryNormalizer);
|
||||||
$resolver->setNormalizer('choice_label', $choiceLabelNormalizer);
|
$resolver->setNormalizer('choice_label', $choiceLabelNormalizer);
|
||||||
$resolver->setAllowedTypes('query', ['null', 'Propel\Runtime\ActiveQuery\ModelCriteria']);
|
$resolver->setAllowedTypes('query', ['null', '\ModelCriteria']);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue