Model Choice Field

diff --git a/ipf/orm/export.php b/ipf/orm/export.php
index 7f5911b710c7bd1ff25e7e5285e9d58ac8106f5c..27f4dd34c98a85dd3880fb28c85b3670546c44e1 100644 (file)
--- a/ipf/orm/export.php
+++ b/ipf/orm/export.php
@@ -363,7 +363,6 @@ class IPF_ORM_Export extends IPF_ORM_Connection_Module
     {
         $sql  = $this->getForeignKeyBaseDeclaration($definition);
         $sql .= $this->getAdvancedForeignKeyOptions($definition);
-
         return $sql;
     }
 

diff --git a/ipf/orm/record.php b/ipf/orm/record.php
index 325e42d4c481e1ffa104c0ba8f76a373b368c66e..7b2b03c4f390d733e351eaf899ca802085c7c5b4 100644 (file)
--- a/ipf/orm/record.php
+++ b/ipf/orm/record.php
@@ -1259,8 +1259,14 @@ abstract class IPF_ORM_Record extends IPF_ORM_Record_Abstract implements Countab
 
     function SetFromFormData($cleaned_values)
     {
+        //$relations = $this->getTable()->getRelations();
         foreach ($cleaned_values as $key=>$val) {
-            $this->$key = $val;
+            /*
+            if (array_key_exists($key,$relations)){
+                
+                
+            }else*/
+                $this->$key = $val;
         }
     }
 }
\ No newline at end of file

diff --git a/ipf/orm/table.php b/ipf/orm/table.php
index 05ea8d5464892bfadd9a3c22265a01390cf53a72..6403fa819d0eb1233c54b1cf6a277088991f296f 100644 (file)
--- a/ipf/orm/table.php
+++ b/ipf/orm/table.php
@@ -408,7 +408,7 @@ class IPF_ORM_Table extends IPF_ORM_Configurable implements Countable
         }
 
         $options['primary'] = $primary;
-
+        
         return array('tableName' => $this->getOption('tableName'),
                      'columns'   => $columns,
                      'options'   => array_merge($this->getOptions(), $options));