Changeset 7017 for trunk/prototype/modules/calendar/js/helpers.js

Timestamp:

08/15/12 11:05:13 (12 years ago)

Author:

acoutinho

Message:

Ticket #3026 - Inconsistencia ao remover atividades pela aba Lista de Tarefas

File:

• trunk/prototype/modules/calendar/js/helpers.js (modified) (3 diffs)

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

@@ -1924 +1924 @@
 }
 
-function remove_event(eventId, idCalendar){
+function remove_event(eventId, idCalendar, type){
     $.Zebra_Dialog('Tem certeza que deseja excluir?', {
         'type':     'question',
@@ -1937 +1937 @@
                 var me = schudableDecode.me.user ? schudableDecode.me.user.id : schudableDecode.me.id;
 
-                DataLayer.removeFilter('schedulable', {filter: ['AND', ['=','id',eventId], ['=','calendar',idCalendar], ['=','user', me]]})
+        var filter = {filter: ['AND', ['=','id',eventId], ['=','calendar',idCalendar], ['=','user', me]]};
+
+        if(type)
+            filter.filter.push(['=','type',type]);
+
+                DataLayer.removeFilter('schedulable', filter);
                 Calendar.rerenderView(true);
             }
@@ -2592 +2597 @@
                                 var eventId = $(this).siblings('[name="eventid"]').val();
                                 var calendarId = $(this).siblings('[name="calendarid"]').val();
-                                remove_event(eventId, calendarId);
+                                remove_event(eventId, calendarId, 2);
                                 event.stopImmediatePropagation()
                         })