Changeset 7990 for branches/2.5/prototype/modules/calendar
- Timestamp:
- 03/11/13 17:58:44 (12 years ago)
- Location:
- branches/2.5/prototype/modules/calendar
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.5/prototype/modules/calendar/interceptors/DBMapping.php
r7982 r7990 471 471 $result = array(); 472 472 $params = array(); 473 473 $realResult = array(); 474 474 foreach ($return as $ret) { 475 475 $currentId = $ret['schedulable']; … … 478 478 $result[$currentId] = Controller::read(array('concept' => 'schedulable', 'id' => $currentId)); 479 479 $result[$currentId]['occurrences'] = array(); 480 481 $calendarToCalendarObj = self::schedulable2calendarToObject($currentId);482 $result[$currentId]['calendar'] = $calendarToCalendarObj[0]['calendar_id'];483 480 } 484 481 … … 486 483 } 487 484 488 return( $result ); 485 foreach($result as $i => $v) 486 { 487 $calendarToCalendarObj = self::schedulable2calendarToObject($v['id']); 488 foreach($calendarToCalendarObj as $vv) 489 { 490 $v['calendar'] = $vv['calendar_id']; 491 $realResult[] = $v; 492 } 493 } 494 495 return( $realResult ); 489 496 } 490 497 -
branches/2.5/prototype/modules/calendar/schedules.php
r7982 r7990 113 113 function normalizeEvents( &$result, $timezones ){ 114 114 115 $myCalendarsT = Controller::service('PostgreSQL')->execResultSql('SELECT calendar_id FROM calendar_signature WHERE user_uidnumber = \''.Config::me('uidNumber').'\' AND is_owner = \'1\' AND type = \'0\''); 116 $myCalendars = array(); 117 foreach($myCalendarsT as $v) 118 $myCalendars[] = $v['calendar_id']; 119 120 115 121 $date = new DateTime('now', new DateTimeZone('UTC')); 116 122 $DayLigth = array(); … … 166 172 $result[$i]['editable'] = (strstr($attend['acl'],"w") || strstr($attend['acl'],"o") || $attend['isOrganizer'] == '1') ? 1 : 0; 167 173 168 if($attend['status'] == STATUS_UNANSWERED )174 if($attend['status'] == STATUS_UNANSWERED && in_array($result[$i]['calendar'] , $myCalendars) ) 169 175 $result[$i]['unanswered'] = 1; 170 176
Note: See TracChangeset
for help on using the changeset viewer.