Changeset 6797 for sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

07/17/12 16:07:52 (12 years ago)

Author:

acoutinho

Message:

Ticket #2966 - primeiras implementacoes de tarefas aninhamento de equipo

File:

• sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js (modified) (5 diffs)

sandbox/2.4.2-expresso1/prototype/modules/calendar/js/calendar.codecs.js

@@ -728 +728 @@
                 id: form.idEvent,
                 location: form.location,
+                type: 1,
                 category: form.category,
                 summary: form.summary,
@@ -953 +954 @@
                         attendee = DataLayer.get('participant', evt.participants[i]);
                         if(attendee.user == User.me.id)
-                            return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? {
+                                            return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? 
+                                                {
                                 selectable: true, 
                                 className: 'fullcalendar-context-menu  event-id-'+idEvent+' calendar-id-'+calendar.id+ (isRecurrence ? ' isRecurrence Recurrence-id-'+Recurrence : '')
@@ -979 +981 @@
                         return returns;
                     }                           
-                    return DataLayer.merge({
+                    return DataLayer.merge(
+                        {
                         editable: aclSignature.acl['write'] && !isRecurrence,
                         disableResizing : (((aclSignature.acl['busy'] && !aclSignature.acl['write']) || (!aclSignature.acl['write'] && aclSignature.acl['read'])) ? true : false),
                         disableDragging  : (((aclSignature.acl['busy'] && !aclSignature.acl['write']) || (!aclSignature.acl['write'] && aclSignature.acl['read'])) ? true: false),
                         className: mountClass(aclSignature.acl)
-                    }, aclSignature.acl['busy'] ? {
-                        title: 'Ocupado', 
-                        selectable: false
-                    } : {
-                        selectable: true
-                    });
+                        }, aclSignature.acl['busy'] ? 
+                        {
+                            title: 'Ocupado', 
+                            selectable: false
+                        } : {
+                            selectable: true
+                        });     
                 }
-                        
             }
                 
@@ -1008 +1011 @@
                   
             for( var i = 0; i < occurrences.length; i++ )
-                grouped[ evt.calendar ].push( DataLayer.merge({
+                grouped[ evt.calendar ].push( DataLayer.merge(
+                {
                     id: evt.URI || evt.id+ '-' + i,
                     title: Encoder.htmlDecode(evt.summary),
@@ -1016 +1020 @@
                     isRepeat: isRepeat,
                     occurrence: i,
+                    type: evt.type,
                     calendar: evt.calendar
                     }, eventEditable(evt.id, isRepeat, i ) ) );