Author: KRavEN
Date: 2010-05-13 20:40:05 +0200 (Thu, 13 May 2010)
New Revision: 29441
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsFormFilter/default/template/ExtjsFormFilterGeneratedTemplate.php
plugins/ExtjsGeneratorPlugin/trunk/lib/generator/ExtjsFormFilterGenerator.class.php
Log:
removed add_empty filter option from forign columns because it is not needed
for extjs combos.
Modified:
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsFormFilter/default/template/ExtjsFormFilterGeneratedTemplate.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsFormFilter/default/template/ExtjsFormFilterGeneratedTemplate.php
2010-05-13 18:20:42 UTC (rev 29440)
+++
plugins/ExtjsGeneratorPlugin/trunk/data/generator/ExtjsFormFilter/default/template/ExtjsFormFilterGeneratedTemplate.php
2010-05-13 18:40:05 UTC (rev 29441)
@@ -17,7 +17,7 @@
'<?php echo $this->translateColumnName($column) ?>'<?php echo
str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getName()))
?> => new <?php echo $this->getWidgetClassForColumn($column) ?>(<?php echo
$this->getWidgetOptionsForColumn($column) ?>),
<?php endforeach; ?>
<?php foreach ($this->getManyToManyTables() as $tables): ?>
- '<?php echo $this->underscore($tables['middleTable']->getClassname())
?>_list'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() -
strlen($this->underscore($tables['middleTable']->getClassname()).'_list')) ?>
=> new ExtjsWidgetFormPropelChoice(array('context' => 'filter', 'model' =>
'<?php echo $tables['relatedTable']->getClassname() ?>', 'add_empty' => true)),
+ '<?php echo $this->underscore($tables['middleTable']->getClassname())
?>_list'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() -
strlen($this->underscore($tables['middleTable']->getClassname()).'_list')) ?>
=> new ExtjsWidgetFormPropelChoice(array('context' => 'filter', 'model' =>
'<?php echo $tables['relatedTable']->getClassname() ?>')),
<?php endforeach; ?>
));
Modified:
plugins/ExtjsGeneratorPlugin/trunk/lib/generator/ExtjsFormFilterGenerator.class.php
===================================================================
---
plugins/ExtjsGeneratorPlugin/trunk/lib/generator/ExtjsFormFilterGenerator.class.php
2010-05-13 18:20:42 UTC (rev 29440)
+++
plugins/ExtjsGeneratorPlugin/trunk/lib/generator/ExtjsFormFilterGenerator.class.php
2010-05-13 18:40:05 UTC (rev 29441)
@@ -151,7 +151,7 @@
if ($column->isForeignKey())
{
- $options[] = sprintf('\'model\' => \'%s\', \'add_empty\' => true',
$this->getForeignTable($column)->getClassname());
+ $options[] = sprintf('\'model\' => \'%s\'',
$this->getForeignTable($column)->getClassname());
$refColumn =
$this->getForeignTable($column)->getColumn($column->getRelatedColumnName());
if (!$refColumn->isPrimaryKey())
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
