Changeset 930

Timestamp:

05/27/09 18:33:25 (15 years ago)

Author:

rafaelraymundo

Message:

Ticket #531 - Verifica se o numero minimo de caracteres foi preenchido

Location:

trunk/calendar

Files:

• inc/class.uicalendar.inc.php (modified) (1 diff)
• templates/celepar/config.tpl (modified) (3 diffs)

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

@@ -4683 +4683 @@
                                                                 // Verifica o tipo da visualização da árvore LDAP, configurado no admin da Agenda
                                                                 $recursive = $GLOBALS['phpgw_info']['server']['cal_type_tree_participants'] == '1' ? true : false;
-                                                                $combo_org = $this->get_organizations(trim(strtolower($context)),$user_context, $recursive);
+                                                                //$combo_org = $this->get_organizations(trim(strtolower($context)),$user_context, $recursive);
                                                                 $footer_ext_participantes = lang("Tip: To search in the <b>Global Catalog</b>, type the <b>F9</b> key, like the ExpressoMail.");
+                                                                //Caso o minimo de caracteres para a busca nao tenha sido preenchido ele sera por padrao = 3
+                                                                if(!$GLOBALS['phpgw_info']['server']['min_num_characters']){
+                                                                        $GLOBALS['phpgw_info']['server']['min_num_characters'] = 3;
+                                                                }
+
+                                                                if ($GLOBALS['phpgw_info']['server']['cal_type_tree_participants'] == '3'){
+                                                                        $combo_org = '<option value='.$context.'>'.strtoupper($context).'</option>';
+                                                                }else{
+                                                                        $combo_org = $this->get_organizations(trim(strtolower($context)),$user_context, $recursive);
+                                                                }
 
                                                                 if ($param['plain'] != "True"){

trunk/calendar/templates/celepar/config.tpl

@@ -1 +1 @@
 <!-- BEGIN header -->
-<form method="POST" action="{action_url}">
+<script type="text/javascript">
+function minValue()
+{
+        if (document.forms["adminForm"]["minNum"].value==""){
+                alert ("Inserir o numero minimo de caracteres");
+                return false;
+        }
+        return true;
+}
+</script>
+
+<form name="adminForm" method="POST" action="{action_url}" onSubmit="return minValue()">
 <table border="0" align="center">
    <tr bgcolor="{th_bg}">
@@ -51 +62 @@
     <td>{lang_Select_type_tree_view}</td>
     <td>
-     <select name="newsettings[cal_type_tree_participants]">      
+     <select name="newsettings[cal_type_tree_participants]">
+      <option value="3" {selected_cal_type_tree_participants_3}>{lang_all_levels}</option>
       <option value="2" {selected_cal_type_tree_participants_2}>{lang_first_level_with_recursive_search}</option>
       <option value="1" {selected_cal_type_tree_participants_1}>{lang_all_levels_with_not_recursive_search}</option>      
@@ -61 +73 @@
    <td>{lang_Min_number_characters}</td>
    <td>
-      <input type="text" value="{value_min_num_characters}" name="newsettings[min_num_characters]" size=2 maxlength=1/>
+      <input type="text" id="minNum" value="{value_min_num_characters}" name="newsettings[min_num_characters]" size=2 maxlength=1/>
    </td>
    </tr>