Changeset 3910

Timestamp:

03/25/11 09:32:12 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1674 - Erro ao delegar evento. Nova correção.

Location:

branches/2.2/calendar

Files:

• inc/class.bocalendar.inc.php (modified) (1 diff)
• inc/class.uicalendar.inc.php (modified) (1 diff)
• js/edit_exmail.js (modified) (2 diffs)

branches/2.2/calendar/inc/class.bocalendar.inc.php

@@ -387 +387 @@
 
                         $this->so->cal->stream->lock(array("phpgw_cal_user"));
+                        
+                        if(substr($idDelegado,-1) == 'U') {
+                            $idDelegado = substr($idDelegado,0,-1);
+                        }
+
                         $sql = "SELECT * FROM phpgw_cal_user where cal_id=$idEvento and cal_login=$idDelegado";
 

branches/2.2/calendar/inc/class.uicalendar.inc.php

@@ -238 +238 @@
 
                 function delegate_event($params=NULL) {
-                        $ldap = CreateObject('expressoMail1_2.ldap_functions');
-                        $delegated = $ldap->uid2uidnumber($_REQUEST['delegated']);
+                        //$ldap = CreateObject('expressoMail1_2.ldap_functions');
+                        //$delegated = $ldap->uid2uidnumber($_REQUEST['delegated']);
 
                         try {
-                                $this->bo->delegar($_REQUEST['delegator'],$ldap->uid2uidnumber($_REQUEST['delegated'])/*$delegated*/,$_REQUEST['event']);
+                                $this->bo->delegar($_REQUEST['delegator'],$_REQUEST['delegated']/*$delegated*/,$_REQUEST['event']);
                                 header("Location: index.php?menuaction=calendar.uicalendar.day&date=".$_REQUEST['date']);
                         }catch(Exception $e) {

branches/2.2/calendar/js/edit_exmail.js

@@ -34 +34 @@
                 }
                 var options = '###';
-                if (data) {
+                if (data.users && data.users.length > 0) {
                         
-                        options += '<option  value="-1" disabled>------------------- '+document.getElementById("txt_users").value+' ------------------ </option>' + data;
+                        options += '<option  value="-1" disabled>------------------- '+document.getElementById("txt_users").value+' ------------------ </option>' + data.users;
                         
                         if(is_firefox_0)
@@ -51 +51 @@
 
         document.getElementById('combo_org').value = context;
-        cExecute (path+'.ldap_functions.get_available_users2&valueAsUidNum=1&context='+context+'&type='+type, handler_get_available_users2);    
+        cExecute (path+'.ldap_functions.get_available_users&context='+context+'&type='+type, handler_get_available_users2);     
 }