projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_company.php
[Pman.Core]
/
DataObjects
/
Core_company.php
diff --git
a/DataObjects/Core_company.php
b/DataObjects/Core_company.php
index
c03d170
..
8245500
100644
(file)
--- a/
DataObjects/Core_company.php
+++ b/
DataObjects/Core_company.php
@@
-259,13
+259,15
@@
class Pman_Core_DataObjects_Core_Company extends DB_DataObject
function beforeUpdate($old, $q,$roo)
{
function beforeUpdate($old, $q,$roo)
{
- var_dump($q); exit;
+
if(!empty($q['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
if(!empty($q['_flag_delete']) && $q['_flag_delete'] * 1 == 1){
- //$delete_dt = date('Y-m-d H:i:s');
$this->deleted_dt = $this->sqlValue("NOW()");
$this->deleted_dt = $this->sqlValue("NOW()");
- $this->deleted_by = $roo->getAuthUser()->name;
- $this->id = $q['_ids'];
-
+ $this->deleted_by = $roo->getAuthUser()->id;
+ }
+
+ if(!empty($q['_flag_undelete']) && $q['_flag_undelete'] * 1 == 1){
+ $this->deleted_dt = "";
+ $this->deleted_by = 0;
}
if(!empty($q['_check_name'])){
if($this->checkName()){
}
if(!empty($q['_check_name'])){
if($this->checkName()){
@@
-334,7
+336,7
@@
class Pman_Core_DataObjects_Core_Company extends DB_DataObject
return $this->id == $au->company_id;
}
return $this->id == $au->company_id;
}
-
+ return true;
return $au->hasPerm("Core.Companies", $lvl);
}
return $au->hasPerm("Core.Companies", $lvl);
}