Changeset 2748 for trunk/calendar

Timestamp:

05/10/10 11:47:10 (14 years ago)

Author:

rodsouza

Message:

Ticket #1058 - Corrigindo problema no calendario para adicionar evento e na visao diaria.

Location:

trunk/calendar

Files:

• inc/class.uicalendar.inc.php (modified) (1 diff)
• js/edit.js (modified) (1 diff)
• js/edit_exmail.js (modified) (3 diffs)

trunk/calendar/inc/class.uicalendar.inc.php

@@ -5218 +5218 @@
                                                                                         '</tr>'.
                                                                                         '</table>'. 
-                                                                                        '<script type="text/javascript" src="phpgwapi/js/dJSWin/dJSWin.js"></script>'.          
-                                                                                        "<script src='calendar/js/edit_exmail.js' type='text/javascript'></script>" .
+                                                                                        '<script type="text/javascript" src="' . $GLOBALS[ 'phpgw' ] -> link( '/phpgwapi/js/dJSWin/dJSWin.js' ) .'"></script>'.         
+                                                                                        '<script src="' . $GLOBALS[ 'phpgw' ] -> link( '/calendar/js/edit_exmail.js' ) . '" type="text/javascript"></script>' .
                                                                                         $load_lang_vars.                                
                                                                                         "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ".                                                                                        

trunk/calendar/js/edit.js

@@ -62 +62 @@
                         participants+=combo[i].value+",";
                 }
-                url = 'index.php?menuaction=calendar.uicalendar.disponibility&participants='+participants+'&date='+document.getElementById('start[str]').value;
+                url = ExpressoLivre.path( ) + 'index.php?menuaction=calendar.uicalendar.disponibility&BackgroundRequest='+Date.parse( new Date )+'&participants='+participants+'&date='+document.getElementById('start[str]').value;
                 
                 //alert(url);

trunk/calendar/js/edit_exmail.js

@@ -56 +56 @@
 var handler_get_available_users = function(data)
 {       
+        data = data.JSON( );
         select_available_users = Element('user_list_in');
         
@@ -90 +91 @@
         }
         var context = document.getElementById('combo_org').value;       
-        cExecute (module+'.ldap_functions.get_available_users&context='+context+'&type='+type, handler_get_available_users);
+        ExpressoLivre.go( {
+                "access" : module+'.ldap_functions.get_available_users&context='+context+'&type='+type,
+                "handler" : handler_get_available_users
+        } );
 }
 
@@ -145 +149 @@
                 if (oText.value.length >= numMin){
                         var context = document.getElementById('combo_org').value;
-                        cExecute ('expressoMail1_2.ldap_functions.search_users&context='+(context)+'&type='+(type == '' ? 'list' : 'search')+'&filter='+oText.value, handler_get_available_users);
+                        ExpressoLivre.go( {
+                                "access" : 'expressoMail1_2.ldap_functions.search_users&context='+escape(context)+'&type='+(type == '' ? 'list' : 'search')+'&filter='+oText.value,
+                                "handler" : handler_get_available_users
+                        } );
                         oWait.innerHTML = ' ';
                 }