Changeset 5596

Timestamp:

03/01/12 11:53:45 (11 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Pequena correcao com permissoes do evento

Location:

trunk/prototype/modules/calendar

Files:

• js/calendar.codecs.js (modified) (1 diff)
• templates/calendar_list.ejs (modified) (1 diff)

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

@@ -638 +638 @@
                             status: !!participantInfo.user ? participantInfo.user.status : 1,
                                 acl: !!participantInfo.user ? constantAcl(participantInfo.user.acl) : constantAcl( 'rowi' ),
-                                isShared: objEvent.calendar && Calendar.signatureOf[objEvent.calendar].isOwner ? true : false,
-                            me: !!participantInfo.user ? DataLayer.merge(participantInfo.user, me) : DataLayer.merge(this.isShared ? this.organizer :  me, {acl:  this.isShared ? 'rowi' : Calendar.signatureOf[objEvent.calendar].permission.aclValues, delegatedFrom: 0, receiveNotification: 1}),
+                                isShared: (!!objEvent.calendar) && parseInt(Calendar.signatureOf[objEvent.calendar].isOwner) ? true : false,
+                            me: !!participantInfo.user ? DataLayer.merge(participantInfo.user, me) : DataLayer.merge(this.isShared ? this.organizer :  me, {acl:  !this.isShared ? 'rowi' : Calendar.signatureOf[objEvent.calendar].permission.aclValues, delegatedFrom: 0, receiveNotification: 1}),
                                 delegatedFrom: delegatedFrom,
                                 statusParticipants: statusParticipants

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

@@ -60 +60 @@
                                                         <div class="cal-list-options my-cal-list-options-<%= signature[i].calendar.id  %> hidden">
                                                                 <ul>
-                                                                        <li><a href="#" onclick="add_tab_configure_calendar(<%= signature[i].calendar.id %>);">Configurações</a></li>
+                                                                        <!--<li><a href="#" onclick="add_tab_configure_calendar(<%= signature[i].calendar.id %>);">Configurações</a></li>-->
                                                                         <li><a href="#" onclick="show_modal_import_export(0, <%= signature[i].calendar.id %>);">Importar</a></li>
                                                                         <li><a href="#" onclick="show_modal_import_export(1, <%= signature[i].calendar.id %>);">Exportar</a></li>