Changeset 5780

Timestamp:

03/21/12 17:32:56 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Corrigido inconsistencia de importar eventos com participacao obrigatoria no expressoMail

Location:

trunk

Files:

• expressoMail1_2/js/main.js (modified) (2 diffs)
• prototype/modules/calendar/constants.php (modified) (1 diff)
• prototype/services/iCal.php (modified) (2 diffs)

trunk/expressoMail1_2/js/main.js

@@ -3375 +3375 @@
                                                 switch(parseInt(typeImport)){
                                                 case 1:
+                                                case 7:
                                                         $("#select-agenda").html('');
                                                                 for(var id in Calendar.calendars){
@@ -3403 +3404 @@
                                                                         }
                                                                  });
+                                                                 
+                                                                 if(typeImport == 7){
+                                                                     $("#import-dialog").find('#select-status option[value=1]').attr('selected','selected').trigger('change');
+                                                                     $("#import-dialog").find('#select-status').attr('disabled','disabled');
+                                                                 }
                                                         break;
                                                 case 2:

trunk/prototype/modules/calendar/constants.php

@@ -28 +28 @@
 define('ICAL_ACTION_REPLY', 5);
 define('ICAL_ACTION_SUGGESTION', 6);
+define('ICAL_ACTION_IMPORT_REQUIRED', 7);
 
 define('ATTENDEE_ACL_ORGANIZATION', 'o');
-define('ATTENDEE_ACL_WRITE', 2);
-define('ATTENDEE_ACL_PARTICIPATION_REQUIRED', 'w');
+define('ATTENDEE_ACL_WRITE', 'w');
+define('ATTENDEE_ACL_PARTICIPATION_REQUIRED', 'p');
 define('ATTENDEE_ACL_INVITE_GUESTES', 'i');
 define('ATTENDEE_ACL_READ', 'r');

trunk/prototype/services/iCal.php

@@ -477 +477 @@
         public function analize ( $data , $params = false)
         {
-                        $vcalendar = new icalCreator( ); 
+            $vcalendar = new icalCreator( ); 
             $vcalendar->parse(trim($data)); 
             $vcalendar->sort();         
@@ -503 +503 @@
                                  if($schedulable ) //Caso o evento exista
                                  {
-                                    if(!self::_existInMyCalendars($schedulable['id']))
-                                          $interation = ICAL_ACTION_IMPORT;   
-                                    else
+                                    if(!self::_existInMyCalendars($schedulable['id'])){
+                                        foreach($schedulable['participants'] as $value)
+                                            if($value['user']['id'] == Config::me('uidNumber')){
+                                                $interation = ( strrpos($value['acl'], ATTENDEE_ACL_PARTICIPATION_REQUIRED) ) ? ICAL_ACTION_IMPORT_REQUIRED : ICAL_ACTION_IMPORT;
+                                                break;
+                                            }                                   
+                                    }else
                                     {
                                         if( self::_getTime($component , 'dtstamp') > $schedulable['dtstamp'] || $component->getProperty( 'sequence' , false , false ) > $schedulable['sequence']) //Organizador esta requisitando que você atualize o evento