Ajax additions, smaller fixes

[fa-stable.git] / includes / ui / ui_lists.inc

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 4d15b0095a4f291e1db4deface6e06b9ab973ce8..3aae252197bbf4a98084e2b824936fed981a2c33 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -30,6 +30,7 @@ $opts = array(                // default options
        'spec_option'=>false,   // option text or false
        'spec_id' => 0,         // option id
                // submit on select parameters
+       'default' => '', // default value when $_POST is not set
        'select_submit' => false, //submit on select: true/false
        'async' => true,        // select update via ajax (true) vs _page_body reload
                // search box parameters
@@ -67,7 +68,7 @@ $opts = array(                // default options
        }
        if ($opts['sel_hint'] === null)
                $opts['sel_hint'] = $by_id || $search_box==false ?
-               '' : _('Press Space tab for search pattern entry');
+                       '' : _('Press Space tab for search pattern entry');
 
        if ($opts['box_hint'] === null)
                $opts['box_hint'] = $search_box ?
@@ -75,7 +76,7 @@ $opts = array(                // default options
                        : _('Enter description fragment to search or * for all')) :'';
 
        if ($selected_id == null) {
-               $selected_id = get_post($name, null);
+               $selected_id = get_post($name, $opts['default']);
        }
        $txt = get_post($search_box);
        $rel = '';
@@ -160,15 +161,14 @@ $opts = array(            // default options
        }
 
        if ($found === false) {
-               $_POST[$name] = $first_id;
+               $selected_id = $first_id;
        }
+       $_POST[$name] = $selected_id;
 
-       if ($by_id) {
+       if ($by_id && $search_box != false) {
                $txt = $_POST[$name];
-               if ($search_box)
-                       $Ajax->addUpdate($name, $search_box, $txt);
+               $Ajax->addUpdate($name, $search_box, $txt);
        }
-
        $selector = "<select $disabled name='$name' class='$class' title='"
                . $opts['sel_hint']."' $rel>".$selector."</select>\n";
 
@@ -225,6 +225,7 @@ $opts = array(              // default options
        'spec_id' => 0,         // option id
        'select_submit' => false, //submit on select: true/false
        'async' => true,        // select update via ajax (true) vs _page_body reload
+       'default' => '', // default value when $_POST is not set
                // search box parameters
        'sel_hint' => null,
        'disabled' => false
@@ -237,7 +238,7 @@ $opts = array(              // default options
        $disabled = $opts['disabled'] ? "disabled" : '';
 
        if ($selected_id == null) {
-               $selected_id = get_post($name, null);
+               $selected_id = get_post($name, $opts['default']);
        }
 
        if (isset($_POST[$select_submit])) {
@@ -472,33 +473,29 @@ function currencies_list($name, $selected_id=null, $submit_on_change=false)
        $sql = "SELECT curr_abrev, currency FROM ".TB_PREF."currencies";
 
 // default to the company currency
-       if ($selected_id == "")
-       {
-                       $selected_id = get_company_currency();
-                       $_POST[$name] = $selected_id;
-       }
 
 return combo_input($name, $selected_id, $sql, 'curr_abrev', 'currency',
        array(
                'select_submit'=> $submit_on_change,
-               'async' => false
+               'default' => get_company_currency(),
+               'async' => false                
        ) );
 }
 
-function currencies_list_cells($label, $name, $selected_id=null)
+function currencies_list_cells($label, $name, $selected_id=null, $submit_on_change=false)
 {
        if ($label != null)
                echo "<td>$label</td>\n";
        echo "<td>";
-       $str = currencies_list($name, $selected_id);
+       $str = currencies_list($name, $selected_id, $submit_on_change);
        echo "</td>\n";
        return $str;
 }
 
-function currencies_list_row($label, $name, $selected_id=null)
+function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false)
 {
        echo "<tr>\n";
-       $str = currencies_list_cells($label, $name, $selected_id);
+       $str = currencies_list_cells($label, $name, $selected_id, $submit_on_change);
        echo "</tr>\n";
        return $str;
 }
@@ -511,15 +508,11 @@ function fiscalyears_list($name, $selected_id=null, $submit_on_change=false)
        $sql = "SELECT * FROM ".TB_PREF."fiscal_year";
 
 // default to the company current fiscal year
-       if ($selected_id == "")
-       {
-                       $selected_id = get_company_pref('f_year');
-                       $_POST[$name] = $selected_id;
-       }
 
 return combo_input($name, $selected_id, $sql, 'id', '',
        array(
                'order' => 'begin',
+               'default' => get_company_pref('f_year'),
                'format' => '_format_fiscalyears',
                'select_submit'=> $submit_on_change,
                'async' => false
@@ -565,9 +558,9 @@ $options = array(
        );
 
        if ($showclosed)
-       $options['where'][] = "closed=0";
+               $options['where'][] = "closed=0";
        if($showtype)
-       $options['where'][] = "type_=$showtype";
+               $options['where'][] = "type_=$showtype";
 
        return combo_input($name, $selected_id, $sql, 'id', 'ref', $options);
 }
@@ -1304,7 +1297,7 @@ function gl_account_types_list_row($label, $name, $selected_id=null, $all_option
 
 //-----------------------------------------------------------------------------------------------
 function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=false,
-       $show_group=false, $cells=false, $all_option=false)
+       $show_group=false, $cells=false, $all_option=false, $submit_on_change=false)
 {
        if ($skip_bank_accounts)
                $sql = "SELECT chart.account_code, chart.account_name, type.name
@@ -1328,7 +1321,9 @@ function gl_all_accounts_list($name, $selected_id=null, $skip_bank_accounts=fals
                        'search_submit' => false,
                        'size' => 12,
                        'max' => 10,
-                       'cells' => true
+                       'cells' => true,
+               'select_submit'=> $submit_on_change,
+               'async' => false
        ) );
 
 }
@@ -1370,7 +1365,7 @@ function yesno_list($name, $selected_id=null, $name_yes="", $name_no="", $submit
 
        return array_selector($name, $selected_id, $items, 
                array( 
-                       'select_submit'=> true, 
+                       'select_submit'=> $submit_on_change,
                        'async' => false ) ); // FIX?
 }