Changeset 7388 for trunk/prototype/modules/calendar/templates

Timestamp:

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

Author:

acoutinho

Message:

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

Location:

trunk/prototype/modules/calendar/templates

Files:

• attendee_add.ejs (modified) (1 diff)
• attendees_task.ejs (modified) (2 diffs)
• notify_alarm_body_task.tpl (added)
• notify_create_delegated_body_task.tpl (modified) (1 diff)

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

@@ -43 +43 @@
                             <%}%>
                             
-                                <li class="organizer <%= (data.event.acl.organization) ? "hidden" : "" %>"> 
+                                <li class="organizer <%= (data.event.acl.organization || (data.event.delegatedFrom[data.event.me.id] && data.event.delegatedFrom[data.event.me.id].isOrganizer == '1')) ? "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>

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

@@ -15 +15 @@
                 <%}%>
             </select>
-            <% if (data.task.id && !data.task.delegatedFrom[data.task.me.id]) { %>
+            <% if (data.task.id && !data.task.delegatedFrom[data.task.me.id] && !data.task.isOrganizer) { %>
                     <fieldset class="add-attendee-options-read">
                             <a href="#" class="button participant-delegate add-attendee-options-button">Delegar participação a um novo participante</a>
@@ -35 +35 @@
                 <label for="attendee" title="<%=  data.task.me.user ? data.task.me.user.mail : data.task.me.mail %>" class="mail hidden"></label>
                 
-                <li class="organizer <%= data.task.isOrganizer ? "hidden" : "" %>"> 
+                <li class="organizer <%= (data.task.isOrganizer || (data.task.delegatedFrom[data.task.me.id] && data.task.delegatedFrom[data.task.me.id].isOrganizer == '1')) ? "hidden" : "" %>">
                     <div style="overflow:hidden; width:100%; display:table;">
                         <span class="space-status ui-icon <%=iconStatus[data.task.organizer.status]%>" title="<%=legendStatus[data.task.organizer.status]%>"></span>

trunk/prototype/modules/calendar/templates/notify_create_delegated_body_task.tpl

@@ -1 @@
-<br />Você foi convidado por [delegatedFrom] para participar em seu lugar ns tarefa agendada para [startDate].<br /><br />
+<br />Você foi convidado por [delegatedFrom] para participar em seu lugar na tarefa agendada para [startDate].<br /><br />
 <strong>[eventTitle]</strong><br />
 <strong>Início:</strong> [startDate] [startTime]<br />