Changeset 6331 for trunk/prototype/modules/calendar/js/helpers.js

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/js/helpers.js (modified) (7 diffs)

trunk/prototype/modules/calendar/js/helpers.js

@@ -623 +623 @@
     $(this).parent().remove().find('li').is(':empty');
 });
-                
-/*Seleciona a agenda padrão para criação de um evento*/
-
-if(objEvent.calendar != undefined)
-    var selectedCalendar = objEvent.calendar;
-else
-    var selectedCalendar = User.preferences.defaultCalendar;
-
-UI.dialogs.addEvent.find('option[value="'+selectedCalendar+'"]').attr('selected','selected').trigger('change');
+
+var myCalendar = function(){
+        for(var i in Calendar.signatures)
+            if(Calendar.signatures[i].isOwner == "1")
+                return Calendar.signatures[i].calendar.id;
+}
                 
 /*Adicionar alarms padrões, quando alterado a agenda do usuário*/               
@@ -691 +688 @@
     .filter('.mail').html(User.me.mail).attr('title',User.me.mail);
 }
-                        
-                        
-                        
-                        
 });
-                
+
 /*Checkbox adicionar alarms padrões*/
 UI.dialogs.addEvent.find('input[name="defaultAlarm"]').click(function(){
@@ -781 +774 @@
                 canDiscardEventDialog = true;
                 /* Remove por filtro */
-                DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objEvent.id], ['=', 'calendar', objEvent.calendar]]});
+                DataLayer.removeFilter('schedulable', {filter: ['AND', ['=', 'id', objEvent.id], ['=', 'calendar', objEvent.calendar], ['=','user',(objEvent.me.user ? objEvent.me.user.id : objEvent.me.id)]]});
                 Calendar.rerenderView(true);
                 /********************/
@@ -1510 +1503 @@
 
 disponibily(objEvent, path, attendees);
-         
+
+/*Seleciona a agenda padrão para criação de um evento*/
+var selectedCalendar = (objEvent.calendar != undefined) ? objEvent.calendar : (User.preferences.defaultCalendar ? User.preferences.defaultCalendar : myCalendar());
+UI.dialogs.addEvent.find('option[value="'+selectedCalendar+'"]').attr('selected','selected').trigger('change');
+
 UI.dialogs.addEvent.find(':input').change(function(event){
     if (event.keyCode != '27' && event.keyCode != '13')
@@ -1915 +1912 @@
         'onClose':  function(clicked) {
             if(clicked == 'Sim'){
-                DataLayer.removeFilter('schedulable', {filter: ['AND', ['=','id',eventId], ['=','calendar',idCalendar]]})
+
+                var schedulable = DataLayer.get('schedulable', '88');
+                
+                schedulable.calendar = idCalendar;
+                
+                var schudableDecode = DataLayer.encode( "schedulable:preview", schedulable);
+                var me = schudableDecode.me.user ? schudableDecode.me.user.id : schudableDecode.me.id;
+
+                DataLayer.removeFilter('schedulable', {filter: ['AND', ['=','id',eventId], ['=','calendar',idCalendar], ['=','user', me]]})
                 Calendar.rerenderView(true);
             }
@@ -2635 +2640 @@
 
     var schedulable = DataLayer.get('schedulable', event+'');
-        
+        
     calendar = !!calendar ? calendar : schedulable.calendar;
         
@@ -2644 +2649 @@
     if(parseInt(type) == 0){
                 
-        schedulable.calendar = calendar;        
+        schedulable.lastCalendar = schedulable.calendar;
+        schedulable.calendar = calendar;        
         DataLayer.put('schedulable', schedulable);