Changeset 7388 for trunk/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

10/09/12 17:19:23 (12 years ago)

Author:

acoutinho

Message:

Ticket #3152 - Inconsistencias na delegacao em tarefas, e erros de tela

File:

• trunk/prototype/modules/calendar/js/calendar.codecs.js (modified) (5 diffs)

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

@@ -128 +128 @@
         var constantAcl = function(acl){
             var returns = {};
+
             for (var i in constantsCalendarShared){
                 returns[constantsCalendarShared[i]] = acl.indexOf(i) >= 0 ? true : false
@@ -133 +134 @@
             return returns;
         };
-    console.log(evtObj);
+
         var res = $.map(evtObj, function( objEvent ){                   
             return {
@@ -676 +677 @@
                 alarms: !!participantInfo.user ? participantInfo.user.alarms : [],
                 status: !!participantInfo.user ? participantInfo.user.status : 1,
-                acl: constantAcl(me.acl || 'roiw'),
+                acl: constantAcl((me.acl && me.acl != '') ? me.acl : ((!objEvent.id || objEvent.id == '') ? 'row' : 'r')),
                 isShared: isShared,
                 isAttendee: (isAttendee ? true : (objEvent.id && isShared ? false : true)),
@@ -764 +765 @@
                     id: attendee,
                     isOrganizer: (form.attendee_organizer == attendee ? 1 : 0 ),
-                    isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0
+                    isExternal: !!parseInt(form.attendeeType[i]) ? 1 : 0,
+                    delegatedFrom: (form.delegatedFrom[i] != '0' && form.delegatedFrom[i] != '') ? form.delegatedFrom[i] : '0'
                     };
             };
@@ -868 +870 @@
                 isExternal: attend.isExternal,
                 acl: attend.acl,
-                delegatedFrom: attend.delegatedFrom
+                delegatedFrom: attend.delegatedFrom,
+                isOrganizer: attend.isOrganizer
             };
 
             if(!!parseInt(attend.delegatedFrom)){
                 delegatedFrom[attend.delegatedFrom] = DataLayer.copy(person);
-                return(null);
+
+                if( !!parseInt(attend.isOrganizer)){
+                    participantInfo.organizer = DataLayer.copy(person);
+                }
+
+                return null;
             }
 
             if( !!parseInt(attend.isOrganizer)){
                 participantInfo.organizer = DataLayer.copy(person);
-                return(null);
+                return null;
             };