projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_enum.php
[Pman.Core]
/
DataObjects
/
Core_enum.php
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
38c0b9e
..
1a91d40
100644
(file)
--- a/
DataObjects/Core_enum.php
+++ b/
DataObjects/Core_enum.php
@@
-158,10
+158,12
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
$tn = $this->tableName();
$x = $this->factory($tn);
$tn = $this->tableName();
$x = $this->factory($tn);
- if(empty($req['etype'])){
- if (empty($req['name'])) {
+ if(empty($req['etype']) || !strlen(trim($req['etype'])) ){
+
+ if (empty($req['name']) || !strlen(trim($req['name']))) {
$roo->jerr('name or etype missing');
}
$roo->jerr('name or etype missing');
}
+
if($x->get('name', $req['name'])){
$roo->jerr('name already exists');
}
if($x->get('name', $req['name'])){
$roo->jerr('name already exists');
}
@@
-174,7
+176,6
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
continue;
}
$bits = explode(',', $l);
continue;
}
$bits = explode(',', $l);
- $x = $this->factory($tn);
$rr = array(
'etype' => $req['etype'],
'name' => array_shift($bits)
$rr = array(
'etype' => $req['etype'],
'name' => array_shift($bits)
@@
-182,10
+183,13
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
$rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
$rr['display_name'] = empty($bits) ? $rr['name'] : $bits[0];
-
+ $x = $this->factory($tn);
+ $x->beforeInsert($rr, $roo);
+ $x->setFrom($rr);
+ $x->insert();
}
}
-
+ $roo->jok("inserted");
} else {
$x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");
} else {
$x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'");