diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use preferred_choices in favor of preferred_query

This commit is contained in:
Toni Uebernickel 2012-12-21 13:48:37 +01:00
parent 6855cffb1d
commit 05fca6d80e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
View File

@ -340,7 +340,11 @@ class ModelChoiceList extends ObjectChoiceList
private function load()
{
$models = (array) $this->query->find();
$preferred = (array) $this->preferredQuery->find();
$preferred = array();
if ($this->preferredQuery instanceof ModelCriteria) {
$preferred = (array) $this->preferredQuery->find();
}
try {
// The second parameter $labels is ignored by ObjectChoiceList

7
src/Symfony/Bridge/Propel1/Form/Type/ModelType.php
View File

@ -24,7 +24,7 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface;
* @author William Durand <william.durand1@gmail.com>
* @author Toni Uebernickel <tuebernickel@gmail.com>
*
* Example using the preferred_query option.
* Example using the preferred_choices option.
*
* <code>
* public function buildForm(FormBuilderInterface $builder, array $options)
@ -38,7 +38,7 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface;
* ->orderByName()
* ->endUse()
* ,
* 'preferred_query' => ProductQuery::create()
* 'preferred_choices' => ProductQuery::create()
* ->filterByIsTopProduct(true)
* ,
* ))
@ -64,7 +64,7 @@ class ModelType extends AbstractType
$options['choices'],
$options['query'],
$options['group_by'],
$options['preferred_query']
$options['preferred_choices']
);
};
@ -79,7 +79,6 @@ class ModelType extends AbstractType
'choice_list' => $choiceList,
'group_by' => null,
'by_reference' => false,
'preferred_query' => null,
));
}