projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ce98b4d
)
DataObjects/Core_enum.php
author
Alan Knowles
<alan@roojs.com>
Mon, 25 Jan 2016 05:21:06 +0000
(13:21 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 25 Jan 2016 05:21:06 +0000
(13:21 +0800)
DataObjects/Core_enum.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
0cd7c18
..
38c0b9e
100644
(file)
--- a/
DataObjects/Core_enum.php
+++ b/
DataObjects/Core_enum.php
@@
-160,14
+160,13
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
if(empty($req['etype'])){
if (empty($req['name'])) {
if(empty($req['etype'])){
if (empty($req['name'])) {
- $roo->jerr('name
missing for new top level etype
');
+ $roo->jerr('name
or etype missing
');
}
if($x->get('name', $req['name'])){
$roo->jerr('name already exists');
}
} else if (!empty($req['_bulk_names'])) {
}
if($x->get('name', $req['name'])){
$roo->jerr('name already exists');
}
} else if (!empty($req['_bulk_names'])) {
-
$lines = explode("\n", $req['_bulk_names']);
foreach($lines as $l) {
$l = trim($l);
$lines = explode("\n", $req['_bulk_names']);
foreach($lines as $l) {
$l = trim($l);
@@
-177,10
+176,12
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
$bits = explode(',', $l);
$x = $this->factory($tn);
$rr = array(
$bits = explode(',', $l);
$x = $this->factory($tn);
$rr = array(
- 'etype');
- $rr['name'] = array_shift($bits);
+ 'etype' => $req['etype'],
+ 'name' => array_shift($bits)
+ );
+
$rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
$rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
- $rr[']
+
}
}