Changeset 7989 for trunk/prototype/modules/calendar/interceptors/DBMapping.php

Timestamp:

03/11/13 17:04:06 (11 years ago)

Author:

cristiano

Message:

Ticket #3378 - Erro de visualização evento com repetição

File:

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

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

@@ -471 +471 @@
         $result = array();
         $params = array();
-
+    $realResult = array();
         foreach ($return as $ret) {
             $currentId = $ret['schedulable'];
@@ -478 +478 @@
                 $result[$currentId] = Controller::read(array('concept' => 'schedulable', 'id' => $currentId));
                 $result[$currentId]['occurrences'] = array();
-
-                $calendarToCalendarObj = self::schedulable2calendarToObject($currentId);
-                $result[$currentId]['calendar'] = $calendarToCalendarObj[0]['calendar_id'];
             }
 
@@ -486 +483 @@
         }
 
-        return( $result );
+    foreach($result as $i => $v)
+    {
+        $calendarToCalendarObj = self::schedulable2calendarToObject($v['id']);
+            foreach($calendarToCalendarObj as $vv)
+            {
+                $v['calendar'] = $vv['calendar_id'];
+                $realResult[] = $v;
+            }
+    }
+
+        return( $realResult );
     }