Changeset 5798

Timestamp:

03/23/12 15:09:46 (12 years ago)

Author:

cristiano

Message:

Ticket #2434 - inportação e exportação de repeat

File:

• trunk/prototype/modules/calendar/interceptors/DBMapping.php (modified) (2 diffs)

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -95 +95 @@
     public function prepareRepeat(&$uri , &$params , &$criteria , $original ){
 
+        if( isset($params['startTime']) || isset($params['endTime']) )
+        {
           $timezone = Controller::read( array( 'concept' => 'schedulable', 'id' => $params['schedulable'] ), array('timezone') );
-          $params['startTime'] = self::parseTimeDate( $params['startTime'], $timezone['timezone'] );
-          $params['endTime'] = self::parseTimeDate( $params['endTime'], $timezone['timezone'] );
+
+          if( isset($params['startTime']) )
+            $params['startTime'] = self::parseTimeDate( $params['startTime'], $timezone['timezone'] );
+          if( isset($params['endTime']) )
+            $params['endTime'] = self::parseTimeDate( $params['endTime'], $timezone['timezone'] );
+        }
     }
       
@@ -570 +576 @@
                            $participants[$ii]['alarms'] = Controller::find( array( 'concept' => 'alarm' ) , null , array('filter' => array('AND' , array('=', 'participant' ,$vv['id'] ) ,array('=' , 'schedulable', $result['id'])) ) ); 
                }  
-
-                $result['participants'] = $participants;
+                $repeat =  Controller::find( array( 'concept' => 'repeat' ), false, array( 'filter' => array( '=', 'schedulable', $result['id'] ) ) );
+                if(is_array($repeat))
+                    $result['repeat'] = $repeat[0] ;
+                
+                $result['participants'] = $participants;
                 }
        }