Changeset 6198

Timestamp:

05/15/12 16:29:47 (12 years ago)

Author:

acoutinho

Message:

Ticket #2740 - Editar/excluir eventos em contas compartilhadas somente leitura

Location:

trunk/prototype/modules/calendar

Files:

• js/calendar.codecs.js (modified) (2 diffs)
• templates/event_add.ejs (modified) (1 diff)

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

@@ -601 +601 @@
             };
 
+            var isShared = !objEvent.id ? false : (!!objEvent.calendar) && parseInt(Calendar.signatureOf[objEvent.calendar].isOwner) ? false : true;
+
+
             return {
                 "class": objEvent["class"],
@@ -682 +685 @@
                 alarms: !!participantInfo.user ? participantInfo.user.alarms : [],
                 status: !!participantInfo.user ? participantInfo.user.status : 1,
-                acl: !!participantInfo.user ? constantAcl(participantInfo.user.acl) : ( ( !objEvent.id || isAttendee ) ? constantAcl( 'rowi' ) : constantAcl( 'r' )),
-                isShared: !this.id ? false : (!!objEvent.calendar) && parseInt(Calendar.signatureOf[objEvent.calendar].isOwner) ? false : true,
-                isAttendee: (isAttendee ? true : (objEvent.id && !this.isShared ? false : true)),
-                me: ((!objEvent.id) || ( objEvent.id && isAttendee)) ? (!!participantInfo.user ? DataLayer.merge(participantInfo.user, me) : DataLayer.merge(this.isShared ? this.organizer :  me, {
-                    acl:  !this.isShared ? 'rowi' : Calendar.signatureOf[objEvent.calendar].permission.aclValues, 
+                acl: isShared ? constantAcl(Calendar.signatureOf[objEvent.calendar].permission.aclValues) : (!!participantInfo.user ? constantAcl(participantInfo.user.acl) : ( ( !objEvent.id || isAttendee ) ? constantAcl( 'rowi' ) : constantAcl( 'r' ))),
+                isShared: isShared,
+                isAttendee: (isAttendee ? true : (objEvent.id && isShared ? false : true)),
+                me: ((!objEvent.id) || ( objEvent.id && isAttendee)) ? (!!participantInfo.user ? DataLayer.merge(participantInfo.user, me) : DataLayer.merge(isShared ? participantInfo.organizer :  me, {
+                    acl:  !isShared ? 'rowi' : Calendar.signatureOf[objEvent.calendar].permission.aclValues, 
                     delegatedFrom: 0, 
                     receiveNotification: 1

trunk/prototype/modules/calendar/templates/event_add.ejs

@@ -72 +72 @@
                         <% 
                           for (var i=0; i< data.event.calendars.length; i++) {
+                            if(data.event.calendars[i].id != data.event.calendar && Calendar.signatureOf[data.event.calendars[i].id].isOwner != '1' && !Calendar.signatureOf[data.event.calendars[i].id].permission.acl.write)
+                                continue;
                         %>
                               <option value="<%= data.event.calendars[i].id %>" <%= data.event.calendars[i].id == data.event.calendar ? 'selected="selected"':'' %>>