projects
/
Pman.Admin
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
993b56b
)
Import/Enum.php
author
Alan Knowles
<alan@roojs.com>
Wed, 8 Apr 2015 06:20:04 +0000
(14:20 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 8 Apr 2015 06:20:04 +0000
(14:20 +0800)
Import/Enum.php
patch
|
blob
|
history
diff --git
a/Import/Enum.php
b/Import/Enum.php
index
ed8b1e4
..
ae40c5d
100644
(file)
--- a/
Import/Enum.php
+++ b/
Import/Enum.php
@@
-108,6
+108,12
@@
class Pman_Admin_Import_Enum extends Pman_Roo
$e = DB_DataObject::factory('core_enum');
$e->etype = $_REQUEST['etype'];
if($e->get('name', $row['NAME'])){
$e = DB_DataObject::factory('core_enum');
$e->etype = $_REQUEST['etype'];
if($e->get('name', $row['NAME'])){
+ if (isset($row['ACTIVE']) && $e->active != $row['ACTIVE']) {
+ $ee =clone($e);
+ $e->active = $row['ACTIVE'];
+ $e->update($ee);
+ $count++;
+ }
continue;
}
continue;
}
@@
-116,7
+122,7
@@
class Pman_Admin_Import_Enum extends Pman_Roo
'name' => $row['NAME'],
'display_name' => $row['DISPLAY NAME'],
'etype' => $_REQUEST['etype'],
'name' => $row['NAME'],
'display_name' => $row['DISPLAY NAME'],
'etype' => $_REQUEST['etype'],
- 'active' => 1,
+ 'active' =>
isset($row['ACTIVE']) ? $row['ACTIVE'] :
1,
));
$e->insert();
$e->onInsert(array());
));
$e->insert();
$e->onInsert(array());