DataObjects/Core_enum.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 6a42840..bd13eda 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -71,15 +71,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
-    function onUpdate($old, $req)
-    {
-        $x = $this->factory($this->tableName());
-        $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')");
-        if ($old->etype != $this->etype) {
-            $x->query("SELECT core_enum_seqmax_update('". $this->escape($old->etype) ."')");
-        }
-        
-    }
+    
     function beforeUpdate($old, $request,$roo)
     {
         $tn = $this->tableName();
@@ -109,12 +101,22 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             }
         }
     }
+    
     function onInsert($req)
     {
         $x = $this->factory($this->tableName());
         $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')");
          
     }
+    function onUpdate($old, $req)
+    {
+        $x = $this->factory($this->tableName());
+        $x->query("SELECT core_enum_seqmax_update('". $this->escape($this->etype) ."')");
+        if ($old->etype != $this->etype) {
+            $x->query("SELECT core_enum_seqmax_update('". $this->escape($old->etype) ."')");
+        }
+    }
+    
     
     function lookup($etype,$name) {
         $ce = DB_DataObject::Factory('core_enum');
@@ -202,6 +204,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             
             $t->setFrom($row);
             $t->setFrom($base);
+            $t->is_system_enum = 1;
             unset($t->seqid); // these might have been changed
             unset($t->display_name); // these might have been changed
             
@@ -210,7 +213,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             {
                 $t->setFrom($row);
                 $t->setFrom($base);
-            
+                $t->is_system_enum = 1;
                 if (!empty($base['etype']) && empty($row['seqid'])) {
                     $t->seqid = $seq_id;
                     $seq_id++;