Changeset 7377 for trunk

Timestamp:

10/09/12 12:02:08 (12 years ago)

Author:

acoutinho

Message:

Ticket #3144 - Nao e enviado email para o usuario ao qual e delegado um evento

Location:

trunk/prototype

Files:

• config/participant.ini (modified) (1 diff)
• modules/calendar/interceptors/DBMapping.php (modified) (1 diff)
• modules/calendar/js/helpers.js (modified) (3 diffs)
• modules/calendar/templates/attendee_add.ejs (modified) (1 diff)
• modules/calendar/templates/participants_add_itemlist.ejs (modified) (1 diff)

trunk/prototype/config/participant.ini

@@ -22 +22 @@
 createParticipantHistoric = modules/calendar/interceptors/DBMapping.php
 
+[before.create]
+encodeCreateParticipant = modules/calendar/interceptors/DBMapping.php
+
 [before.delete]
 prepareParticipantHistoric = modules/calendar/interceptors/DBMapping.php

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

@@ -51 +51 @@
 class DBMapping extends Helpers {
 
+
+
+    /*
+     * Verificar inconsistencia no FF
+     * */
+    static function encodeCreateParticipant(&$uri, &$params, &$criteria, $original)
+    {
+        if(isset($params['delegatedFrom']) && is_array($params['delegatedFrom'])){
+            $params['delegatedFrom'] = $params['delegatedFrom']['id'];
+        }
+    }
+
+
     static function encodeCreateSchedulable(&$uri, &$params, &$criteria, $original) 
     {

trunk/prototype/modules/calendar/js/helpers.js

@@ -1246 +1246 @@
         user[0].acl = objEvent.acl;
         user[0].isDirty = !!!objEvent.id;
+        user[0].isDelegate = (objEvent.id && (objEvent.me.status == '5'));
 
         blkAddAtendee.find('dd.attendee-list ul.attendee-list').append(
@@ -1280 +1281 @@
             isExternal: 1, 
             acl: objEvent.acl,
-            isDirty: !!!objEvent.id
+            isDirty: !!!objEvent.id,
+        isDelegate: (objEvent.id && (objEvent.me.status == '5'))
             }])
         ).scrollTo('max');
@@ -1391 +1393 @@
                     isExternal: old_item.find('.isExternal').html(), 
                     acl: objEvent.acl,
-                    isDirty: !!!objEvent.id
+                    isDirty: !!!objEvent.id,
+            isDelegate: (objEvent.id && (objEvent.me.status == '5'))
                     }]))
                 .scrollTo('max');

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

@@ -125 +125 @@
                                         </li>   
                                 <%} 
-                        } else if(data.event.me.id == data.event.organizer.id && !(data.event.attendee.length > 0) ) { %>
+                        } else if((data.event.me.id == data.event.organizer.id) && (data.event.attendee.length == 0) && $.isEmptyObject(data.event.delegatedFrom)){ %>
                                 <li class="not-attendee">Não há outros participantes.</li>
                         <% } %>

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

@@ -2 +2 @@
         <div style="overflow:hidden; width:100%; display:table;">
                 <div class="attendee-options">
-                        <%if( !data[0].isDelegate && (!data[0].isDirty && data[0].notEvent) || (!data[0].isDirty && data[0].acl && (data[0].acl.organization || data[0].acl.write || data[0].acl.inviteGuests))){%>
+                        <%if( !data[0].isDelegate && ((!data[0].isDirty && data[0].notEvent) || (!data[0].isDirty && data[0].acl && (data[0].acl.organization || data[0].acl.write || data[0].acl.inviteGuests)))){%>
                                 <a href="#" class="button delegate attendee-options-button-delegate new">Delegar participação a este participante</a>
                         <%}%>