projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b1ebc0f
)
DataObjects/Core_enum.php
author
Chris
<chris@roojs.com>
Thu, 18 Jul 2013 04:47:19 +0000
(12:47 +0800)
committer
Chris
<chris@roojs.com>
Thu, 18 Jul 2013 04:47:19 +0000
(12:47 +0800)
DataObjects/Core_enum.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
bd13eda
..
887d13f
100644
(file)
--- a/
DataObjects/Core_enum.php
+++ b/
DataObjects/Core_enum.php
@@
-204,11
+204,10
@@
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
-
if (!$t->find(true))
{
$t->setFrom($row);
@@
-219,6
+218,9
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
$seq_id++;
}
$t->insert();
+ }else{
+ $t->is_system_enum = 1;
+ $t->update();
}
if (!empty($row['cn'])) {
$this->initEnums($row['cn'], array('etype' => $t->name));