Changeset 7964 for trunk

Timestamp:

03/05/13 17:29:17 (11 years ago)

Author:

acoutinho

Message:

Ticket #3376 - Listagem de eventos nao mostra eventos de contas compartilhadas

File:

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

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

@@ -1891 +1891 @@
 
 function getSelectedCalendars( reverse, type ){
-        var selector = "";
-        if(type == 0)
-                selector = ".my-calendars";
-        if(type == 1)
-                selector = ".my-groups-task";
-    var selecteds = {};
-    var cont = 0; 
-    jQuery(function() {
-        jQuery(selector+" .calendar-view").each(function(i, obj) { 
-            var check_box = obj;
-            if( reverse ? !check_box.checked : check_box.checked ) {
-                selecteds[cont] = obj.value;
-                cont++;
-            };
-        });               
+    var selector = !!type ? "div.my-groups-task .calendar-view" : "div.my-calendars .calendar-view, div.signed-calendars .calendar-view";
+    var returns = [];
+
+    $.each( $(selector), function(i , c){
+
+        if( reverse ? !c.checked : c.checked )
+            returns.push( c.value );
+
     });
-    if (!cont)
-        return false;
-        
-    selecteds.length = cont;
-    return $.makeArray( selecteds );
+
+    if (!returns.length)
+            return false;
+
+    return returns;
 }
 
@@ -2286 +2279 @@
                 
     $('.calendar-view').click(function(evt){
-        if($tabs.tabs('option' ,'selected') != 0){
-            pageselectCallback('', 0, false, type);
-        }
-                        
-        if(Calendar.currentView){
-            var checkBox = $(this);
-            if(!!Calendar.currentView[ checkBox.val() ]){
-
-        $.each(Calendar.signatures , function(index, value) {
-
-            if(value.calendar.id == checkBox.val())
-            {
-                value.hidden = checkBox.is(':checked') ? 0 : 1  ;
-
-                DataLayer.put('calendarSignature', {id: ''+value.id , hidden: value.hidden }  );
-                DataLayer.commit();
-            }
-
-        });
-
-                Calendar.currentView[ checkBox.val() ].hidden = !checkBox.is(':checked');
-                $('#calendar').fullCalendar( 'refetchEvents' );
-            }
-        }
+
+        var checkBox = $(this);
+        var calendarId = $(this).val();
+
+        Calendar.signatureOf[ calendarId ].hidden =  (checkBox.is(':checked') ? 0 : 1 );
+
+        DataLayer.put('calendarSignature', {id: Calendar.signatureOf[ calendarId ].id , hidden: Calendar.signatureOf[ calendarId ].hidden }  );
+        DataLayer.commit();
+
+
+         if($tabs.tabs('option' ,'selected') == 0){
+
+             if(Calendar.currentView && !!Calendar.currentView[ calendarId ]){
+
+                 Calendar.currentView[ calendarId ].hidden = !checkBox.is(':checked');
+                 $('#calendar').fullCalendar( 'refetchEvents' );
+             }
+
+         }else{
+             type = $tabs.tabs('option' ,'selected');
+             type = type > 2 ? 2 : (type - 1)
+
+             pageselectCallback('', 0, false, type);
+         }
     });
 });