X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=8f5845c18dad56cb6e633c67e19a26ae228fa879;hb=c15e9146f62fdb50ef61fa55722bd78c89d491f9;hp=80ee77b601067808e14babc88fa496310e78e5e5;hpb=926e12e9982cf7163b8aaeae919458771ce160ac;p=Pman.Core diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php index 80ee77b6..8f5845c1 100644 --- a/DataObjects/Core_notify.php +++ b/DataObjects/Core_notify.php @@ -77,6 +77,11 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject return false; } + function beforeDelete($dependants_array, $roo) { + if ($this->delivered()) { + $roo->jerr("you can not delete a record of a successfull delivery"); + } + } function act_start($set = false) @@ -109,7 +114,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject { switch($this->event_id) { case -1: - return 'DELIVERED'; + return 'DELIVERED'; //not valid.. case 0: return 'PENDING'; default: @@ -130,7 +135,13 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject //DB_DAtaObject::DebugLevel(1); // then we can build a join.. $d = DB_DataObject::Factory($q['ontable']); - $d->autoJoin(); + $ji = $d->autoJoin(); + echo '
';print_R($ji); + // get cols + foreach($ji['join_names'] as $cname=>$fname) { + $this->selectAdd($fname . ' as ontable_id_' . $cname ); + } + //$this->selectAdd($d->_query['data_select']); -- this will cause the same dataIndex... $this->_join .= " LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id @@ -146,15 +157,15 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject switch ($q['query']['status']) { case 'SUCCESS'; - $this->whereAdd("event_id < 0"); + $this->whereAdd("msgid != ''"); break; case 'FAILED'; - $this->whereAdd('event_id > 0 AND act_when <= NOW() '); + + $this->whereAdd("msgid = '' AND event_id > 0 AND act_when < NOW()"); break; case 'PENDING'; $this->whereAdd('event_id = 0 OR (event_id > 0 AND act_when > NOW() )'); - break; case 'ALL': default: