projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug for combos type 0 in non-js mode
[fa-stable.git]
/
includes
/
ui
/
ui_lists.inc
diff --git
a/includes/ui/ui_lists.inc
b/includes/ui/ui_lists.inc
index 454932cd32898ed7fed7963574aa622482a74856..51b0e956a4fe93f4dd687e125dfcc61cdee2e546 100644
(file)
--- a/
includes/ui/ui_lists.inc
+++ b/
includes/ui/ui_lists.inc
@@
-66,7
+66,7
@@
$opts = array( // default options
}
if ($opts['sel_hint'] === null)
$opts['sel_hint'] = $by_id || $search_box==false ?
}
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 ?
if ($opts['box_hint'] === null)
$opts['box_hint'] = $search_box ?
@@
-81,6
+81,9
@@
$opts = array( // default options
$limit = '';
if (isset($_POST[$select_submit])) {
$limit = '';
if (isset($_POST[$select_submit])) {
+
+ if ($by_id) $txt = $_POST[$name];
+
if (!$opts['async'])
$Ajax->activate('_page_body');
else
if (!$opts['async'])
$Ajax->activate('_page_body');
else
@@
-91,22
+94,22
@@
$opts = array( // default options
$rel = "rel='$search_box'"; // set relation to list
if ($opts['search_submit']) {
$rel = "rel='$search_box'"; // set relation to list
if ($opts['search_submit']) {
- // if selected from list - set focus on next field
+
if (isset($_POST[$search_submit])) {
$Ajax->activate($name);
}
if ($txt == '') {
if ($spec_option === false)
if (isset($_POST[$search_submit])) {
$Ajax->activate($name);
}
if ($txt == '') {
if ($spec_option === false)
- $limit = ' LIMIT 1';
+
$limit = ' LIMIT 1';
else
else
- $opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'";
+
$opts['where'][] = $valfield . "='". get_post($name, $spec_id)."'";
}
else
if ($txt != '*') {
foreach($opts['search'] as $i=> $s)
$opts['search'][$i] = $s . " LIKE '%{$txt}%'";
}
else
if ($txt != '*') {
foreach($opts['search'] as $i=> $s)
$opts['search'][$i] = $s . " LIKE '%{$txt}%'";
- $opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
+
$opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
}
}
}
}
}
}
@@
-124,7
+127,7
@@
$opts = array( // default options
$selector = $first_opt = '';
$first_id = false;
$found = false;
$selector = $first_opt = '';
$first_id = false;
$found = false;
-//if($name=='
code_id')
display_error($sql);
+//if($name=='
SelectStockFromList')
display_error($sql);
if($result = db_query($sql)) {
while ($contact_row = db_fetch($result)) {
$value = $contact_row[0];
if($result = db_query($sql)) {
while ($contact_row = db_fetch($result)) {
$value = $contact_row[0];
@@
-536,7
+539,7
@@
function stock_items_list_cells($label, $name, $selected_id, $all_option=false,
if ($label != null)
echo "<td>$label</td>\n";
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
if ($label != null)
echo "<td>$label</td>\n";
$str = stock_items_list($name, $selected_id, $all_option, $submit_on_change,
- array('cells'=>true));
+
array('cells'=>true));
return $str;
}
/*
return $str;
}
/*
@@
-757,7
+760,7
@@
function tax_types_list($name, $selected_id, $none_option=false, $submit_on_chan
return combo_input($name, $selected_id, $sql, 'id', 'name',
array(
'spec_option' => $none_option,
return combo_input($name, $selected_id, $sql, 'id', 'name',
array(
'spec_option' => $none_option,
- 'spec_id' =>
$all_items
,
+ 'spec_id' =>
0
,
'select_submit'=> $submit_on_change,
'async' => false,
) );
'select_submit'=> $submit_on_change,
'async' => false,
) );
@@
-796,7
+799,7
@@
function tax_groups_list($name, $selected_id,
array(
'order' => 'id',
'spec_option' => $none_option,
array(
'order' => 'id',
'spec_option' => $none_option,
- 'spec_id' =>
$all_items
,
+ 'spec_id' =>
0
,
'select_submit'=> $submit_on_change,
'async' => false,
) );
'select_submit'=> $submit_on_change,
'async' => false,
) );