Changeset 6177 for trunk/prototype/modules/calendar/interceptors/Notifications.php

Timestamp:

05/14/12 16:15:42 (12 years ago)

Author:

acoutinho

Message:

Ticket #2727 - Quando criado evento com repeticoes com a hora data ou hora menor que a hora atual

File:

• trunk/prototype/modules/calendar/interceptors/Notifications.php (modified) (6 diffs)

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

@@ -43 +43 @@
                     $updated[] = $concept['id'];
             }
-            else if ($concept['concept'] === 'schedulable') { //Caso exista schedulable no commit antecipa o carregamento do owner
+            else if ($concept['concept'] === 'schedulable') { //Caso exista schedulable no commit antecipa o carregamento do owner              
                 $schedulables[$concept['id']] = Controller::read(array('concept' => 'schedulable', 'id' => $concept['id']), false, array('deepness' => '2'));
                 foreach ($schedulables[$concept['id']]['participants'] as $i => $v) //salva em $organizers as informações do organizador      
@@ -69 +69 @@
                     continue; //escapa organizador
                 $schedulable = isset($schedulables[$pCreated['schedulable']]) ? $schedulables[$pCreated['schedulable']] : Controller::read(array('concept' => 'schedulable', 'id' => $pCreated['schedulable']), false, array('deepness' => '2'));
-                if (!self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd']))
+                if (!self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))
                     continue; //Escapa eventos do passado
 
@@ -96 +96 @@
                     continue; //escapa organizador
                 $schedulable = isset($schedulables[$pUpdated['schedulable']]) ? $schedulables[$pUpdated['schedulable']] : Controller::read(array('concept' => 'schedulable', 'id' => $pUpdated['schedulable']), false, array('deepness' => '2'));
-                if (!self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd']))
+                if (!self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))
                     continue; //Escapa eventos do passado
 
@@ -452 +452 @@
     public function deleteEvent(&$uri, &$result, &$params, $original) {
         $schedulable = Controller::read(array('concept' => 'schedulable', 'id' => $uri['id']), null, array('deepness' => '2'));
-        if ((Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd']))) {
+        if ((Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))) {
             $method = 'CANCEL';
             $notificationType = 'Cancelamento de Calendario';
@@ -478 +478 @@
         $schedulable = Controller::read(array('concept' => 'schedulable', 'id' => $participant['schedulable']));
 
-        if ((Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd']))) {
+        if ((Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))) {
             $method = 'CANCEL';
             $notificationType = 'Cancelamento de Calendario';
@@ -509 +509 @@
             }
 
-        if (($alt === true) && (Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd']))) {
+        if (($alt === true) && (Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))) {
             $method = 'REQUEST';
             $notificationType = 'Modificação de Calendario';