Changeset 7983 for trunk

Timestamp:

03/08/13 18:05:43 (11 years ago)

Author:

cristiano

Message:

Ticket #3379 - Problema ao remover um participante e verificar disponibilidade

Location:

trunk/prototype/modules/calendar

Files:

• assetic.php (modified) (1 diff)
• js/helpers.js (modified) (5 diffs)

trunk/prototype/modules/calendar/assetic.php

@@ -86 +86 @@
 $compressor->setCharset("ISO-8859-1");
 
-if (strpos($javaVersion,"java version") !== false){
-    $filterManager->set('yui_js', $compressor);    
-    $js->ensureFilter($filterManager->get('yui_js'));    
-}
+/*if (strpos($javaVersion,"java version") !== false){
+    $filterManager->set('yui_js', $compressor);
+    $js->ensureFilter($filterManager->get('yui_js'));
+}*/
 
 $jsCache = new AssetCache($js,new FilesystemCache('/tmp'));

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

@@ -182 +182 @@
 
     attendees = {};
-        
+
+    if(!!objEvent.participants)
+    {
+        $.each(objEvent.participants ,function(index, value) {
+            var part = DataLayer.get('participant' , value );
+            var user = DataLayer.get('user' , part.user );
+
+            attendees[part.user] = user.name;
+        });
+    }
+
     if(path == undefined)
         path = "";
@@ -248 +258 @@
             text: false
         }).click(function () {
-            DataLayer.remove('participant', $(this).parents('li').find('[type=checkbox]').val());
+        var participant = DataLayer.get('participant' , $(this).parents('li').find('[type=checkbox]').val());
+            DataLayer.remove('participant', participant.id);
             if($(this).parent().find('.button.delegate').hasClass('attendee-permissions-change-button')){
                 removeOthers();
@@ -256 +267 @@
                 blkAddAtendee.find('option[value=1]').attr('selected','selected').trigger('change');
             }
-                        
             $(this).parents('li').remove();
                         
             if(blkAddAtendee.find(".attendee-list li").length == 1)
                 blkAddAtendee.find("li.not-attendee").removeClass('hidden');
+        delete attendees[participant.user];
         })
         .addClass('tiny disable ui-button-disabled ui-state-disabled')
@@ -445 +456 @@
     }
     );
-        
-                
 }
 
@@ -1019 +1028 @@
 var attendeeHtml = DataLayer.render( path+'templates/attendee_add.ejs', {
     event:objEvent
-});             
+});
         
 // load template of attendees
 var blkAddAtendee = UI.dialogs.addEvent.find('#calendar_addevent_details6').append(attendeeHtml);
-if(objEvent.attendee.length) 
+if(objEvent.attendee.length)
                 callbackAttendee(); 
 /**