Changeset 6331 for trunk/prototype/modules/calendar/js/calendar.codecs.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/calendar.codecs.js (modified) (8 diffs)

trunk/prototype/modules/calendar/js/calendar.codecs.js

@@ -153 +153 @@
         delete DataLayer.tasks[this.clookRefresh];
         
-        this.clookRefresh = (parseInt(($.now()) / 1000) + this.timeRefresh);
-        
-        DataLayer.task( this.clookRefresh , function(){
-            Calendar.rerenderView(true);
-        });
-
+        //Realiza agendamentos de atualização de view somente se o módulo aberto for expressoCalendar
+        if(User.moduleName == "expressoCalendar"){
+            this.clookRefresh = (parseInt(($.now()) / 1000) + this.timeRefresh);
+
+            DataLayer.task( this.clookRefresh , function(){
+                Calendar.rerenderView(true);
+            });
+        }
     }
 }
@@ -516 +518 @@
         var pref = User.preferences;
                 
-        var Owner = decodeOwnerCalendar(evtObj.calendar);       
+        var Owner = decodeOwnerCalendar(evtObj[0].calendar);    
 
         var res = $.map(evtObj, function( form ){
                         
-            return {
+            return DataLayer.merge({
                 id: form.idEvent,
-                calendar: form.calendar,
                 participants : $.map(form.attendee, function( attendee, i ){
                     if(isNaN(attendee)){
@@ -536 +537 @@
                         if(DataLayer.get('participant', attendee).user == Owner.id){
                             var me = {
-                                user: User.id,
+                                user: Owner.id,
                                 status: form.status,
                                 id: attendee,
@@ -580 +581 @@
                     };
                 })
-            }
+            }, (Owner.id == User.me.id) ? (form.calendar != form.lastCalendar ? {calendar: form.calendar, lastCalendar: form.lastCalendar} : {}) : {})
         });
         return notArray ? res[0] : res;
@@ -641 +642 @@
                 attachments: $.map(objEvent.attachments || [], function( attachment, i ){
                     var attach = DataLayer.get('schedulableToAttachment', attachment, false);
-                    //TODO - Verificar na API retorno de id sobre os conceitos em que são utilizados tabelas de ligação
+                    //TODO - Verificar na API retorno de id sobre os conceitos em que s?o utilizados tabelas de liga??o
                     if(!attach.name) return(null); 
                     
@@ -838 +839 @@
             var Owner = decodeOwnerCalendar(form.calendar);
 
-            return {
+            return DataLayer.merge({
                 "class": form["class"],
                 startTime: Date.parseExact(form.startDate + (!!form.allDay ? " 00:00": " "+$.trim(form.startHour)) , formatString ).toString('yyyy-MM-dd HH:mm:00'),
@@ -846 +847 @@
                 location: form.location,
                 category: form.category,
-                calendar: form.calendar,
                 summary: form.summary,
                 description: form.description,
@@ -901 +901 @@
                     };
                 })
-            };
+            }, form.lastCalendar ? (( form.lastCalendar == form.calendar ) ? {} : {calendar: form.calendar, lastCalendar: form.lastCalendar}) : {calendar: form.calendar});
         });