X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=8f5845c18dad56cb6e633c67e19a26ae228fa879;hb=c15e9146f62fdb50ef61fa55722bd78c89d491f9;hp=0d2b2bdeb79a8d01dee44db0bc8c50789bd6738d;hpb=89d226f53548a25fdb773299f63cc4806998b697;p=Pman.Core diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php index 0d2b2bde..8f5845c1 100644 --- a/DataObjects/Core_notify.php +++ b/DataObjects/Core_notify.php @@ -64,17 +64,24 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject return $set; } $c = DB_DataObject::factory($this->ontable); + if ($this->onid == 0) { return $c; // empty dataobject. } $c->autoJoin(); + if ($c->get($this->onid)) { return $c; } 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) @@ -100,14 +107,14 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject } function delivered() { - return !empty($msgid); + return !empty($this->msgid); } function status() // used by commandline reporting at present.. { switch($this->event_id) { case -1: - return 'DELIVERED'; + return 'DELIVERED'; //not valid.. case 0: return 'PENDING'; default: @@ -125,16 +132,46 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events' . 'core_watch'))) { // this will only work on tables not joined to ours. - + //DB_DAtaObject::DebugLevel(1); // then we can build a join.. $d = DB_DataObject::Factory($q['ontable']); - $d->autoJoin(); - $this->selectAdd($d->_query['data_select']); + $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 - {$d->join} + {$d->_join} "; + $this->selectAs($d, 'core_notify_%s'); } + if (isset($q['query']['person_id_name']) ) { + $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'"); + + } + if (!empty($q['query']['status'])) { + switch ($q['query']['status']) { + + case 'SUCCESS'; + $this->whereAdd("msgid != ''"); + break; + case 'FAILED'; + + $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: + break; + } + }