Author: Kris.Wallsmith
Date: 2010-02-10 20:42:03 +0100 (Wed, 10 Feb 2010)
New Revision: 27842
Modified:
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
Log:
[1.3, 1.4] fixed typo, fixed consistent use of field rather than column name in
doctrine form generators (closes #8254)
Modified:
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
===================================================================
---
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
2010-02-10 19:41:49 UTC (rev 27841)
+++
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
2010-02-10 19:42:03 UTC (rev 27842)
@@ -253,7 +253,7 @@
}
else if ($column->isPrimaryKey())
{
- $options[] = sprintf('\'model\' => \'%s\', \'column\' => \'%s\'',
$this->table->getOption('name'), $this->table->getFieldName($columnName));
+ $options[] = sprintf('\'model\' => \'%s\', \'column\' => \'%s\'',
$this->table->getOption('name'), $column->getFieldName());
}
else
{
Modified:
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
===================================================================
---
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
2010-02-10 19:41:49 UTC (rev 27841)
+++
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
2010-02-10 19:42:03 UTC (rev 27842)
@@ -429,7 +429,7 @@
}
else if ($column->isPrimaryKey())
{
- $options[] = sprintf('\'model\' => $this->getModelName(), \'column\' =>
\'%s\'', $column->getName());
+ $options[] = sprintf('\'model\' => $this->getModelName(), \'column\' =>
\'%s\'', $column->getFieldName());
}
else
{
@@ -566,7 +566,7 @@
{
if ($column->getDefinitionKey('unique'))
{
- $uniqueColumns[] = array($column->getName());
+ $uniqueColumns[] = array($column->getFieldName());
}
}
Modified:
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
===================================================================
---
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
2010-02-10 19:41:49 UTC (rev 27841)
+++
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
2010-02-10 19:42:03 UTC (rev 27842)
@@ -253,7 +253,7 @@
}
else if ($column->isPrimaryKey())
{
- $options[] = sprintf('\'model\' => \'%s\', \'column\' => \'%s\'',
$this->table->getOption('name'), $this->table->getFieldName($columnName));
+ $options[] = sprintf('\'model\' => \'%s\', \'column\' => \'%s\'',
$this->table->getOption('name'), $column->getFieldName());
}
else
{
Modified:
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
===================================================================
---
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
2010-02-10 19:41:49 UTC (rev 27841)
+++
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
2010-02-10 19:42:03 UTC (rev 27842)
@@ -429,7 +429,7 @@
}
else if ($column->isPrimaryKey())
{
- $options[] = sprintf('\'model\' => $this->getModelName(), \'column\' =>
\'%s\'', $column->getName());
+ $options[] = sprintf('\'model\' => $this->getModelName(), \'column\' =>
\'%s\'', $column->getFieldName());
}
else
{
@@ -566,7 +566,7 @@
{
if ($column->getDefinitionKey('unique'))
{
- $uniqueColumns[] = array($column->getName());
+ $uniqueColumns[] = array($column->getFieldName());
}
}
--
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.
