Changeset 6359 for trunk/prototype/modules/calendar/js/calendar.codecs.js

Timestamp:

05/31/12 11:06:40 (12 years ago)

Author:

acoutinho

Message:

Ticket #2818 - Inconsistência na remoção de eventos na listagem de eventos

File:

• trunk/prototype/modules/calendar/js/calendar.codecs.js (modified) (2 diffs)

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

@@ -212 +212 @@
 
     rerenderView: function(force){
-                //TODO - Remover if quando centralizar o objeto User que contem as informações do usuário logado em um local acessível a todos módulos
-                if(User.moduleName == "expressoCalendar"){
-                        if(force){
-                                delete Calendar.currentViewKey;
-                                $('#calendar').fullCalendar( 'refetchEvents' );
-                                Refresh.init()
-                        }
-
-                        var calendarNotSelected = getSelectedCalendars( true );
-                        for(var i = 0; i < calendarNotSelected.length; i++)
-                                if(!!Calendar.currentView[ calendarNotSelected[i] ])
-                                Calendar.currentView[ calendarNotSelected[i] ].hidden = true;
-
-                        $('#calendar').fullCalendar( 'refetchEvents' ); 
-
-                        contentMenu();
-                }
+        //TODO - Remover if quando centralizar o objeto User que contem as informações do usuário logado em um local acessível a todos módulos
+        if(User.moduleName == "expressoCalendar"){
+            if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') == 0){
+                if(force){
+                    delete Calendar.currentViewKey;
+                    $('#calendar').fullCalendar( 'refetchEvents' );
+
+                    //Recarrega os alarmes de eventos    
+                    Alarms.load();
+
+                    Refresh.init();
+                }
+
+                var calendarNotSelected = getSelectedCalendars( true );
+                for(var i = 0; i < calendarNotSelected.length; i++)
+                        if(!!Calendar.currentView[ calendarNotSelected[i] ])
+                        Calendar.currentView[ calendarNotSelected[i] ].hidden = true;
+
+                $('#calendar').fullCalendar( 'refetchEvents' ); 
+
+                contentMenu();
+            }else if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0)
+                pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0);
+        }
     }
 }
@@ -313 +320 @@
     if( status === 'serverclient' ){
         DataLayer.commit( false, false, function(){     
-            if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') == 0){
-                Calendar.rerenderView(true);
-            }else if((typeof($tabs) != "undefined") && $tabs.tabs('option' ,'selected') != 0)
-                pageselectCallback($('.events-list-win.active [name=keyword]').val(), 0);
-            //Recarrega os alarmes de eventos    
-            Alarms.load();
+            Calendar.rerenderView(true);
         });
     }