Changeset 29661

Timestamp:

05/28/10 18:56:42 (2 years ago)

Author:

Kris.Wallsmith

Message:

[1.3, 1.4] changed generation of (non-foreign key) primary key form fields so validation will fail if the primary key is changed (closes #8639, refs #8704)

Files:

• branches/1.3/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php (modified) (2 diffs)
• branches/1.3/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormGenerator.class.php (modified) (2 diffs)
• branches/1.4/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php (modified) (2 diffs)
• branches/1.4/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormGenerator.class.php (modified) (2 diffs)

branches/1.3/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php

@@ -406 +406 @@
-    }
-
-PrimaryKey() || $column->is
+
-    {
-      $validatorSubclass = 'DoctrineChoice';
+    }
+    else if ($column->isPrimaryKey())
+    {
+      $validatorSubclass = 'Choice';
-    }
-
@@ -430 +434 @@
-    else if ($column->isPrimaryKey())
-    {
-model\' => $this->getModelName(), \'column\' => \'%s\'
+choices\' => array($this->getObject()->get(\'%s\')), \'empty_value\' => $this->getObject()->get(\'%1$s\')
-    }
-    else

branches/1.3/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormGenerator.class.php

@@ -326 +326 @@
-    }
-
-PrimaryKey() || $column->is
+
-    {
-      $name = 'PropelChoice';
-    }
+    else if ($column->isPrimaryKey())
+    {
+      $name = 'Choice';
+    }
-
-    return sprintf('sfValidator%s', $name);
@@ -351 +355 @@
-    else if ($column->isPrimaryKey())
-    {
-model\' => \'%s\', \'column\' => \'%s\'', $column->getTable()->getClassname(), $this->translateColumnName($column
+choices\' => array($this->getObject()->get%s()), \'empty_value\' => $this->getObject()->get%1$s()', $this->translateColumnName($column, false, BasePeer::TYPE_PHPNAME
-    }
-    else

branches/1.4/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php

@@ -406 +406 @@
-    }
-
-PrimaryKey() || $column->is
+
-    {
-      $validatorSubclass = 'DoctrineChoice';
+    }
+    else if ($column->isPrimaryKey())
+    {
+      $validatorSubclass = 'Choice';
-    }
-
@@ -430 +434 @@
-    else if ($column->isPrimaryKey())
-    {
-model\' => $this->getModelName(), \'column\' => \'%s\'
+choices\' => array($this->getObject()->get(\'%s\')), \'empty_value\' => $this->getObject()->get(\'%1$s\')
-    }
-    else

branches/1.4/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormGenerator.class.php

@@ -326 +326 @@
-    }
-
-PrimaryKey() || $column->is
+
-    {
-      $name = 'PropelChoice';
-    }
+    else if ($column->isPrimaryKey())
+    {
+      $name = 'Choice';
+    }
-
-    return sprintf('sfValidator%s', $name);
@@ -351 +355 @@
-    else if ($column->isPrimaryKey())
-    {
-model\' => \'%s\', \'column\' => \'%s\'', $column->getTable()->getClassname(), $this->translateColumnName($column
+choices\' => array($this->getObject()->get%s()), \'empty_value\' => $this->getObject()->get%1$s()', $this->translateColumnName($column, false, BasePeer::TYPE_PHPNAME
-    }
-    else