Changeset 5752 for trunk/prototype/modules/calendar/interceptors

Timestamp:

03/19/12 16:38:05 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Correcao na edicao de repeticao com n repeticoes

File:

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

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

@@ -110 +110 @@
           $occ = array();
 
-          if( $occurrences = self::checkOccurrences( $start, $end, intval($criteria['deepness']) + 1 ) )
+          if( $occurrences = self::checkOccurrences( $start, $end ) )
               foreach( $occurrences as $id => $occurrence )
               {
@@ -188 +188 @@
     }
 
-    public function checkOccurrences( $start, $end, $deep ){
+    public function checkOccurrences( $start, $end ){
 
         $ranges = Controller::find( array( 'concept' => 'repeatRange' ), array( 'rangeStart', 'rangeEnd' ),  array( 'filter' => array( '=', 'user', Config::me("uidNumber") ) ) );
@@ -217 +217 @@
 
             if( !isset( $result[ $id ] ) )
-                $result[ $id ] = array();
+                $result[ $id ] = !$initialized ?  array( $repeat['startTime'] ) : array();
 
             if( !$initialized )
@@ -329 +329 @@
 
     $return = array();
-
+    
     while($result = $r->next())
     {