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

Timestamp:

05/28/12 21:17:51 (12 years ago)

Author:

acoutinho

Message:

Ticket #2795 - Problema ao tentar aceitar convite da agenda para a conta compartilhada

File:

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

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

@@ -373 +373 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-    public function updateCalendar(&$uri, &$params, &$criteria, $original) {
-        if (isset($params['calendar'])) {
-            $calendarObjects = self::schedulable2calendarToObject($uri['id']);
-            $params2['calendar'] = $params['calendar'];
-
-            foreach ($calendarObjects as $calendarObject)
+    public function updateCalendar(&$uri, &$params, &$criteria, $original) {       
+        if (isset($params['calendar'])) {
+            if(isset($params['lastCalendar'])){
+                $calendarObjects = self::referenceCalendarToObject($uri['id'], $params['lastCalendar']);
+                $params2['calendar'] = $params['calendar'];
+            }else{
+                $calendarObjects = self::schedulable2calendarToObject($uri['id']);
+                $params2['calendar'] = $params['calendar'];
+            }
+            
+            foreach ($calendarObjects as $calendarObject)
                 Controller::update(array('concept' => 'calendarToSchedulable', 'id' => $calendarObject['calendar_to_calendar_object']), $params2);
 
@@ -717 +722 @@
             $idCalendar = $criteria['filter'][2][2];
             
-            if(!self::ownerSchedulable($idSchedulable)){
+            if(!self::ownerSchedulable($idSchedulable, $criteria['filter'][3][2])){
                 $isPermissionFromOwner = self::permissionFromCalendarSignature($idCalendar, $idSchedulable);
                 
@@ -727 +732 @@
 
                     foreach($calendarsToSchedulable as $value)
-                        if($value['calendar_id'] == $idCalendar){
+                        if($value['calendar_id'] == $idCalendar){    
+
+                            $participant = Controller::read(array('concept' => 'participant'), array('id'), array('filter' =>
+                                array('AND',
+                                    array('=', 'user', $criteria['filter'][3][2]),
+                                    array('=', 'schedulable', $idSchedulable)
+                                )));
+
+                            Controller::call(('update'), array('concept' => 'participant', 'id' => $participant[0]['id']), array('status' => STATUS_CANCELLED));
                             Controller::delete(array('concept' => 'calendarToSchedulable', 'id' => $value['calendar_to_calendar_object']));
                             break;
@@ -740 +753 @@
         $calendarsToSchedulable = self::schedulable2calendarToObject($uri['id']);
 
-        if (!self::ownerSchedulable($uri['id']) && !self::isAllowDeleteInCalendar($calendarsToSchedulable[0]['calendar_id'])) {
+        if (!self::ownerSchedulable($uri['id'], Config::me('uidNumber')) && !self::isAllowDeleteInCalendar($calendarsToSchedulable[0]['calendar_id'])) {
 
             foreach ($calendarsToSchedulable as $i => $v) {
@@ -750 +763 @@
 
             /* Seta o participante como rejeitado */
-            Controller::update(array('concept' => 'participant'), array('status' => STATUS_CANCELLED), array('filter' =>
+            $participant = Controller::read(array('concept' => 'participant'), array('id'), array('filter' =>
                 array('AND',
                     array('=', 'user', Config::me('uidNumber')),
-                    array('=', 'schedulable', $uri['id'])
-                    )));
+                    array('=', 'schedulable', $idSchedulable)
+                )));
+
+            Controller::call(('update'), array('concept' => 'participant', 'id' => $participant[0]['id']), array('status' => STATUS_CANCELLED));
 
             return false; /* Mata o restante da execução */
@@ -1017 +1032 @@
     
     
-    private static function ownerSchedulable($id) {
+    private static function ownerSchedulable($id, $me) {
 
         $isOwner = Controller::find(array('concept' => 'participant'), array('id'), array('filter' =>
                     array('AND',
                         array('=', 'isOrganizer', '1'),
-                        array('=', 'user', $_SESSION['wallet']['user']['uidNumber']),
+                        array('=', 'user', $me),
                         array('=', 'schedulable', $id)
                         )));
@@ -1028 +1043 @@
         return ( isset($isOwner[0]['id']) ) ? true : false;
     }
-
+    
+    
+    private static function referenceCalendarToObject($schedulable, $calendar) {
+        return Controller::service('PostgreSQL')->execResultSql('SELECT calendar_to_calendar_object.id as calendar_to_calendar_Object FROM calendar_to_calendar_object'
+            . ' WHERE calendar_to_calendar_object.calendar_id = '. $calendar
+            . ' AND calendar_to_calendar_object.calendar_object_id = ' . addslashes($schedulable));
+    }
+    
     private static function schedulable2calendarToObject($Schedulable) {
         return Controller::service('PostgreSQL')->execResultSql('SELECT calendar_to_calendar_object.id as calendar_to_calendar_Object , calendar.name as calendar_name ,calendar.location as calendar_location, calendar.id as calendar_id FROM calendar_to_calendar_object , calendar , calendar_signature'