Changeset 5937

Timestamp:

04/12/12 17:40:47 (12 years ago)

Author:

marcieli

Message:

Ticket #2622 - Corrigido: referenciar agenda padrão definida nas preferencias ao criar evento.

Location:

trunk/prototype

Files:

• config/PostgreSQL.srv (modified) (1 diff)
• modules/calendar/js/calendar.codecs.js (modified) (1 diff)
• modules/calendar/js/helpers.js (modified) (3 diffs)

trunk/prototype/config/PostgreSQL.srv

@@ -3 +3 @@
 [config]
 port = 5432
-dbname= expresso
-user=postgres
-host = /var/run/postgresql
+dbname= expresso24marcieli
+user=expressodev
+host = /tmp/
 ;conexão via tcp
 ;host = 127.0.0.1
 
 ;user=
-;password=
+password=prognus

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

@@ -923 +923 @@
 
     encoder: function( evtObj, filter ){
-      
+    contentMenu();
         if( !evtObj )
             return( false );

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

@@ -68 +68 @@
 {
         attendees = {};
-
+        
         if(path == undefined)
                 path = "";
@@ -288 +288 @@
                 
         }
-        
+
         var html = DataLayer.render( path+'templates/event_add.ejs', {event:objEvent}); 
                 
@@ -540 +540 @@
                 
                 /*Seleciona a agenda padrão para criação de um evento*/
-                UI.dialogs.addEvent.find('option[value="'+objEvent.calendar || User.preferences.defaultCalendar+'"]').attr('selected','selected').trigger('change');
+
+                if(objEvent.calendar != undefined)
+                        var selectedCalendar = objEvent.calendar;
+                else
+                        var selectedCalendar = User.preferences.defaultCalendar;
+
+                UI.dialogs.addEvent.find('option[value="'+selectedCalendar+'"]').attr('selected','selected').trigger('change');
                 
                 /*Adicionar alarms padrões, quando alterado a agenda do usuário*/