Changeset 8003 for branches/2.5

Timestamp:

03/12/13 16:25:52 (11 years ago)

Author:

douglas

Message:

Ticket #3385 - ERRO ao Ao excluir um evento de uma agenda compartilhada

Location:

branches/2.5/prototype

Files:

• config/participant.ini (modified) (1 diff)
• modules/calendar/interceptors/Notifications.php (modified) (3 diffs)
• modules/calendar/js/init.js (modified) (1 diff)

branches/2.5/prototype/config/participant.ini

@@ -28 +28 @@
 [before.delete]
 prepareParticipantHistoric = modules/calendar/interceptors/DBMapping.php
+deleteParticipant = modules/calendar/interceptors/Notifications.php
 
 [after.delete]

branches/2.5/prototype/modules/calendar/interceptors/Notifications.php

@@ -483 +483 @@
     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'], $schedulable['id']))) {
             $method = 'CANCEL';
@@ -490 +491 @@
 
             if (count($part) > 0)
-                self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_cancel_body');
+        { 
+            $from = false; 
+            foreach($schedulable['participants'] as $v) 
+            { 
+                if($v['isOrganizer'] == 1) 
+                    $from =  $v; 
+            } 
+ 
+            self::sendMail($data, $ical, implode(',', $part), $subject, 'notify_cancel_body' , $from ); 
+        } 
         }
     }
@@ -507 +517 @@
 
         $participant = Controller::read(array('concept' => 'participant', 'id' => $uri['id']), null, array('deepness' => '1'));
-        $schedulable = Controller::read(array('concept' => 'schedulable', 'id' => $participant['schedulable']));
+    $schedulable = Controller::read(array('concept' => 'schedulable', 'id' => $participant['schedulable']) , false , array('deepness' => '2'));
 
         if ((Config::regGet('noAlarm') === false) && (self::futureEvent($schedulable['startTime'], $schedulable['rangeEnd'], $schedulable['id']))) {
             $method = 'CANCEL';
             $notificationType = 'Cancelamento de Calendario';
-            $part = 'others';
-            self::mountStruture(false, $schedulable, false, $data, $subject, $ical, $part, $method, $notificationType);
-
-            self::sendMail($data, $ical, $participant['user']['mail'], $subject, 'notify_cancel_body');
+            $part = 'me'; 
+            self::mountStruture($schedulable['id'], $schedulable, false, $data, $subject, $ical, $part, $method, $notificationType); 
+ 
+        $from = false; 
+        foreach($schedulable['participants'] as $v) 
+        { 
+            if($v['isOrganizer'] == 1) 
+                $from =  $v; 
+        } 
+            self::sendMail($data, $ical, $participant['user']['mail'], $subject, 'notify_cancel_body' , $from); 
         }
     }

branches/2.5/prototype/modules/calendar/js/init.js

@@ -482 +482 @@
                                 'onClose':  function(clicked) {
                                     if(clicked == 'Editar todas ocorrências') {
-
-                                        eventDetails(  getSchedulable(evt.id, ''), true);
+                                        var schedule = getSchedulable(evt.id, ''); 
+                                        schedule.calendar = evt.calendar; 
+                                        eventDetails( schedule , true); 
 
                                     }else if (clicked == 'Editar essa ocorrência'){