Changeset 1639 for trunk/calendar/inc/class.uicalendar.inc.php

Timestamp:

11/13/09 13:40:27 (14 years ago)

Author:

niltonneto

Message:

Ticket #745 - Corrigido problema que não respeita configuração do módulo.

File:

• trunk/calendar/inc/class.uicalendar.inc.php (modified) (4 diffs)

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

@@ -835 +835 @@
                         $date = $cal_date ? $cal_date : 0;
                         $date = $date ? $date : (int)$_GET['date'];
-
+        
                         // First, make sure they have permission to this entry
                         if ($cal_id < 1)
@@ -1695 +1695 @@
                                                 }
                                                 $str .= "\n";
-                                        }
-                                }
+                        }
+                        }
                                 $str .= '</tr>'
                                         . '<tr><td height="1" colspan="'.((11 * $interval) + 1).'" bgcolor="#999999"><img src="'.$pix.'"></td></tr>';
-                        }
+                }
                         $this->bo->owner = $owner;
                         $this->bo->so->owner = $owner;
@@ -5056 +5056 @@
                                                                                         '<td valign="bottom">'.
                                                                                         '       '.lang("Organization").': '.
-                                                                                        '       <select name="org_context" id="combo_org" onchange="javascript:get_available_users(\''.$module_name.'\',\''.$GLOBALS['phpgw_info']['server']['auto_search'].'\',\''.($recursive ? "" : "search").'\');">'.$combo_org.'</select>'.
+                                                                                        '       <select name="org_context" id="combo_org" onchange="javascript:get_available_users(\''.$module_name.'\',this.value,\''.($recursive ? "" : "search").'\',\''.$GLOBALS['phpgw_info']['server']['auto_search'].'\');">'.$combo_org.'</select>'.
                                                                                         '       <br>'.
                                                                                         '       <font color="red"><span id="cal_span_searching">&nbsp;</span></font>'.                                                                  
                                                                                         '       <br>'.lang("Search for").':'.
-                                                                                        '       <input value="" id="cal_input_searchUser" size="35" autocomplete="off" onkeyup="javascript:optionFinderTimeout(this,'.$GLOBALS['phpgw_info']['server']['min_num_characters'].')"><br>'.
+                                                                                        '       <input value="" id="cal_input_searchUser" size="35" autocomplete="off" onkeyup="javascript:optionFinderTimeout(this,'.$GLOBALS['phpgw_info']['server']['min_num_characters'].',\''.($recursive ? "" : "search").'\',\''.$GLOBALS['phpgw_info']['server']['auto_search'].'\')"><br>'.
                                                                                         '       <b>'.lang("Available users and groups").'</b><br>'.
                                                                                         '       <select id="user_list_in" style="width: 300px" multiple size="13"></select>'.
-                                            '</td>'.
-                                            '</tr>'.
+                                                                                        '</td>'.
+                                                                                        '</tr>'.
                                             '<tr>'.
                                             '<td width="25%">'.
@@ -5084 +5084 @@
                                                                                         "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ".                                                                                        
                                                                                         "<script type='text/javascript'>" .
-                                                                                        "var timeout_get_available_users = setTimeout('get_available_users(\"".$module_name."\",\'".$GLOBALS['phpgw_info']['server']['auto_search']."\',\'".$user_context."\',\'".($recursive ? "" : "search")."\')',1000);". 
+                                                                                        "var timeout_get_available_users = setTimeout('get_available_users(\"".$module_name."\",\'".$user_context."\',\'".($recursive ? "" : "search")."\',\'".$GLOBALS['phpgw_info']['server']['auto_search']."\')',1000);". 
                                                                                         "</script> "
                                                                 );