fix generate form for many-to-many relation, use isCrossRef informati…

…on to prevent wrong generation
jaugustin · Oct 13, 2011 · 904b2fa · 904b2fa
1 parent 7cb12ff
commit 904b2fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/generator/sfPropelFormGenerator.class.php b/lib/generator/sfPropelFormGenerator.class.php
@@ -125,6 +125,10 @@ public function getManyToManyTables()
     // go through all tables to find m2m relationships
     foreach ($this->dbMap->getTables() as $tableName => $table)
     {
+      if (!$table->isCrossRef()) {
+        continue;
+      }
+
       foreach ($table->getColumns() as $column)
       {
         if ($column->isForeignKey() && $column->isPrimaryKey() && $this->table->getClassname() == $this->getForeignTable($column)->getClassname())

diff --git a/lib/generator/sfPropelGenerator.class.php b/lib/generator/sfPropelGenerator.class.php
@@ -73,6 +73,10 @@ public function getManyToManyTables()
       // load this table's relations and related tables
       $table->getRelations();
 
+      if (!$table->isCrossRef()) {
+        continue;
+      }
+
       foreach ($table->getColumns() as $column)
       {
         if ($column->isForeignKey() && $column->isPrimaryKey() && $this->getTableMap()->getClassname() == $this->dbMap->getTable($column->getRelatedTableName())->getClassname())