configure exclusion of order field

diff --git a/ipf/form/model.php b/ipf/form/model.php
index 1bf2cdf14cf20f2284de2a561840942674e0c966..fd7a92824b95d552f73c2e29bce86b2c56a8ced6 100644 (file)
--- a/ipf/form/model.php
+++ b/ipf/form/model.php
@@ -26,13 +26,19 @@ class IPF_Form_Model extends IPF_Form
                 $exclude = array();
 
             foreach ($db_columns as $name => $col) {
-                if (array_search($name, $exclude) === false && !isset($col['exclude']))
-                    $this->addDBField($name, $col);
+                if (array_search($name, $exclude) !== false)
+                    continue;
+                if (isset($col['exclude']) && $col['exclude'])
+                    continue;
+                $this->addDBField($name, $col);
             }
 
             foreach ($db_relations as $name => $relation) {
-                if (array_search($name, $exclude) === false && !isset($relation['exclude']))
-                    $this->addDBRelation($name, $relation, $col); // FIXME: $col is undefined
+                if (array_search($name, $exclude) !== false)
+                    continue;
+                if (isset($relation['exclude']) && $relation['exclude'])
+                    continue;
+                $this->addDBRelation($name, $relation, $col); // FIXME: $col is undefined
             }
         } else {
             foreach ($user_fields as $uname) {
@@ -61,9 +67,9 @@ class IPF_Form_Model extends IPF_Form
             return;
 
         $defaults = array(
-            'blank' => true,
+            'blank'     => true,
             'help_text' => '',
-            'editable' => true,
+            'editable'  => true,
             'verbose'   => isset($col['verbose']) ? $col['verbose'] : $name,
         );
 

diff --git a/ipf/orm/template/orderable.php b/ipf/orm/template/orderable.php
index 0d26546c354b599ac8fe9ef91066cb5a212f7f54..327082853ca886e160730ba9e5d870a2b0b1f7cb 100644 (file)
--- a/ipf/orm/template/orderable.php
+++ b/ipf/orm/template/orderable.php
@@ -3,11 +3,16 @@
 class IPF_ORM_Template_Orderable extends IPF_ORM_Template
 {
     private $columnName = 'ord';
+    private $exclude = true;
 
     public function __construct(array $options=array())
     {
-        if ($options && array_key_exists('name', $options))
-            $this->columnName = $options['name'];
+        if ($options) {
+            if (array_key_exists('name', $options))
+                $this->columnName = $options['name'];
+            if (array_key_exists('exclude', $options))
+                $this->exclude = $options['exclude'];
+        }
     }
 
     public function getColumnName()
@@ -17,7 +22,7 @@ class IPF_ORM_Template_Orderable extends IPF_ORM_Template
 
     public function setTableDefinition()
     {
-        $this->hasColumn($this->columnName, 'integer', null, array('exclude' => true));
+        $this->hasColumn($this->columnName, 'integer', null, array('exclude' => $this->exclude));
         $this->getTable()->listeners['Orderable_'.$this->columnName] = new IPF_ORM_Template_Listener_Orderable($this->columnName);
     }
 }