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