Changeset 5611 for trunk/prototype
- Timestamp:
- 03/02/12 15:30:02 (13 years ago)
- Location:
- trunk/prototype
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/config/followupflag.ini
r5540 r5611 4 4 [before.find] 5 5 addVerifyOwnerFilter = modules/mail/interceptors/FollowupflagSecure.php 6 addDefaultElementsFilter = modules/mail/interceptors/ FollowupflagSecure.php6 addDefaultElementsFilter = modules/mail/interceptors/Helpers.php 7 7 8 8 ;[before.delete] -
trunk/prototype/modules/mail/interceptors/FollowupflagSecure.php
r5540 r5611 14 14 } 15 15 16 //followupflag:before.find17 public function addDefaultElementsFilter (&$uri , &$params , &$criteria , $original ){18 19 $defaultsFilter = array( 'IN' , 'id' , array('1','2','3','4','5','6') );20 21 if (isset($criteria['filter']) && $criteria['filter']!=NULL && count($criteria['filter']) != 0)22 $criteria['filter'] = array( 'OR', $criteria['filter'], $defaultsFilter );23 else24 $criteria['filter'] = $defaultsFilter;25 26 }27 28 16 } 29 17 -
trunk/prototype/modules/mail/interceptors/Helpers.php
r5609 r5611 86 86 //followupflag:before.find 87 87 public function addDefaultElementsFilter (&$uri , &$params , &$criteria , $original ){ 88 if (!self::in_arrayr('id', $criteria['filter'])) {88 //if (!self::in_arrayr('id', $criteria['filter'])) { 89 89 $defaultsFilter = array( 'IN' , 'id' , array('1','2','3','4','5','6') ); 90 90 … … 93 93 else 94 94 $criteria['filter'] = $defaultsFilter; 95 }96 } 95 //} 96 } 97 97 98 98 //followupflagged:after.find … … 105 105 if(isset($v['followupflagId'])) 106 106 { 107 $followupflag = Controller::find(array('concept' => 'followupflag'), false, array('filter' => array('=', 'id', $v['followupflagId']) )); 108 $result[$i]['followupflag'] = $followupflag[0]; 107 $followupflags = Controller::find(array('concept' => 'followupflag'), false, array('filter' => array('=', 'id', $v['followupflagId']) )); 108 109 /** 110 * Devido há inconsistencias na chamada do interceptor addDefaultElementsFilter (followupflag:before.find) 111 * os followupflag defaults 112 */ 113 foreach ($followupflags as $followupflag) { 114 if ($v['followupflagId'] == $followupflag['id']) { 115 $result[$i]['followupflag'] = $followupflag; 116 break; 117 } 118 } 109 119 } 110 120
Note: See TracChangeset
for help on using the changeset viewer.