Changeset 6295 for trunk/prototype/modules

Timestamp:

05/24/12 16:26:24 (12 years ago)

Author:

acoutinho

Message:

Ticket #2795 - Problema ao tentar aceitar convite da agenda para a conta compartilhada

Location:

trunk/prototype/modules/calendar

Files:

• constants.php (modified) (1 diff)
• interceptors/DBMapping.php (modified) (1 diff)
• js/calendar.codecs.js (modified) (2 diffs)
• templates/attendee_add.ejs (modified) (1 diff)

trunk/prototype/modules/calendar/constants.php

@@ -31 +31 @@
 define('ICAL_ACTION_ORGANIZER_UPDATE', 8);
 define('ICAL_ACTION_ORGANIZER_NONE', 9);
+define('ICAL_ACTION_IMPORT_FROM_PERMISSION', 10);
+define('ICAL_ACTION_NONE_FROM_PERMISSION', 11);
 
 define('ATTENDEE_ACL_ORGANIZATION', 'o');

trunk/prototype/modules/calendar/interceptors/DBMapping.php

@@ -819 +819 @@
         //Veirifica pois o usuário pode ter varias assinaturas mas não ser dona de nenhuma
         if (count($result) > 0) {
-            foreach ($result as $key) {
-                if ($key['isOwner'] != 0)
+            foreach ($result as $value) {
+                if (isset($value['isOwner']) && $value['isOwner'] != 0)
                     $isValidSignature = true;
             }

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

@@ -656 +656 @@
                             })
                         };
-                        me.id = attend.id;
+                        me = attend;
                         return(null);
                     };
@@ -685 +685 @@
                 alarms: !!participantInfo.user ? participantInfo.user.alarms : [],
                 status: !!participantInfo.user ? participantInfo.user.status : 1,
-                acl: isShared ? constantAcl(Calendar.signatureOf[objEvent.calendar].permission.aclValues) : (!!participantInfo.user ? constantAcl(participantInfo.user.acl) : ( ( !objEvent.id || isAttendee ) ? constantAcl( 'rowi' ) : constantAcl( 'r' ))),
+                acl: constantAcl(me.acl || 'roiw'),
                 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
-                })) : (DataLayer.merge( ( participantInfo.organizer || me), {
-                    acl: 'r'
-                } ) ),
+                me: me,
                 delegatedFrom: delegatedFrom,
-                                
                 statusParticipants: statusParticipants
             };

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

@@ -39 +39 @@
                 <dd class="attendee-list">
                         <ul class="attendee-list">
-                                <li class="organizer <%= (data.event.acl.organization || !data.event.isAttendee) ? "hidden" : "" %>"> 
+                                <li class="organizer <%= (data.event.acl.organization) ? "hidden" : "" %>"> 
                                         <div style="overflow:hidden; width:100%; display:table;">
                                                 <span class="space-status ui-icon <%=iconStatus[data.event.organizer.status]%>" title="<%=legendStatus[data.event.organizer.status]%>"></span>