Changeset 5617

Timestamp:

03/03/12 20:22:17 (12 years ago)

Author:

acoutinho

Message:

Ticket #2434 - Adicionado no setup da expressoCalendar as atualizacoes ao banco

Location:

trunk

Files:

• expressoCalendar/setup/setup.inc.php (modified) (2 diffs)
• prototype/modules/calendar/js/calendar.codecs.js (modified) (1 diff)
• prototype/modules/calendar/js/calendar.shared.js (modified) (6 diffs)

trunk/expressoCalendar/setup/setup.inc.php

@@ -13 +13 @@
         $setup_info['expressoCalendar']['title']        = 'Expresso Calendar';
         /* Ao incrementar versão, não esquecer de declarar função do tables_update.inc.php*/
-        $setup_info['expressoCalendar']['version']      = '1.000';
+        $setup_info['expressoCalendar']['version']      = '1.001';
         $setup_info['expressoCalendar']['app_order']    = 10;
         
@@ -29 +29 @@
                 $setup_info['expressoCalendar']['tables'][]             =  'calendar_repeat';
                 $setup_info['expressoCalendar']['tables'][]             =  'calendar_signature';
-                $setup_info['expressoCalendar']['tables'][]             =  'calendar_signature_alarm';
+        $setup_info['expressoCalendar']['tables'][]             =  'calendar_signature_alarm';
                 $setup_info['expressoCalendar']['tables'][]             =  'module_preference';
-                $setup_info['expressoCalendar']['tables'][]             =  'calendar_to_calendar_object';
+        $setup_info['expressoCalendar']['tables'][]             =  'calendar_to_calendar_object';
                                 
         $setup_info['expressoCalendar']['enable']               = 1;

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

@@ -929 +929 @@
                                         attendee = DataLayer.get('participant', evt.participants[i]);
                                                 if(attendee.user == User.me.id)
-                                                        return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? {selectable: true, className: 'fullcalendar-context-menu  event-id-'+idEvent} : {editable: false, className: 'blocked-event-permision  fullcalendar-not-context-menu event-id-'+idEvent};
+                                                        return (attendee.acl.indexOf('w') >= 0 || attendee.acl.indexOf('o') >= 0 ) ? {selectable: true, className: 'fullcalendar-context-menu  event-id-'+idEvent} : {editable: false, selectable: true ,className: 'blocked-event-permision  fullcalendar-not-context-menu event-id-'+idEvent};
                                 }
                                 return {editable: false, className: 'blocked-event-permision  fullcalendar-not-context-menu event-id-'+idEvent,  selectable: true};

trunk/prototype/modules/calendar/js/calendar.shared.js

@@ -4 +4 @@
         //Variaval global para manipulação dos usuários
         //melhor perforface
-        currentUsers = [];
+        currentUsers = {};
         currentUsers[User.me.id] = true;
         changePublic = false;
@@ -17 +17 @@
                                 close: function(event, ui) {
                                         //Implementações de cancelar
-                                        currentUsers = [];
+                                        currentUsers = {};
                                 }
                         });
@@ -250 +250 @@
                 );              
         }
-        
+
         //Carrega os dados já cadastrados
         var dataCurrent = DataLayer.get('calendarToPermission:detail', {filter: ['=','calendar', calendarId]  , criteria: {deepness: 2}}, true);
@@ -287 +287 @@
         //Variaval global para manipulação dos usuários
         //melhor perforface
-        currentCalendars = [];
+        currentCalendars = {};
         
         if (!UI.dialogs.sharedCalendar) {
@@ -298 +298 @@
                                 close: function(event, ui) {
                                         //Implementações de cancelar :D
-                                        currentCalendars = [];
+                                        currentCalendars = {};
                                         $('.signed-calendars').find('.calendar-shared-search input').val('').Watermark('Pesquisar agendas...');
                                 }
@@ -449 +449 @@
                         if(clicked == 'Sim'){
                                 DataLayer.remove('calendarSignature', ''+signatureId);
-                                DataLayer.commit();
+                                DataLayer.commit( false, false, function( received ){
+                                        delete Calendar.currentViewKey;
+                                        Calendar.load();
+                                        refresh_calendars();
+                                });
                         }
                 }