holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: wildcard search

Browse Source
This commit is contained in:
Cornelius Weiß 2005-12-01 17:16:04 +00:00
parent a7fc10f621
commit ac8eb8bf72
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etemplate/inc/class.advancedsearch_widget.inc.php
View File

@ -171,6 +171,14 @@
'label' => 'Operator',
'no_lang' => true,
)));
$tpl->add_child($button_box, $meth_select = $tpl->empty_cell('select','meth_select',array(
'sel_options' => array(
'%' => lang('contains'),
false => lang('exact'),
),
'no_lang' => true,
'default' => '%',
)));
$tpl->add_child($button_box, $search_button = $tpl->empty_cell('button','button[search]',array(
'label' => 'Search',
)));
@ -260,8 +268,9 @@
$order_by = $query['order'] ? $query['order'].' '.$query['sort'] : '';
$only_keys = implode(',',array_flip($query['colums_to_present']));
$rows = ExecMethod2($query['search_method'],$query['search_values'],$only_keys,
$order_by,'','','',$query['search_values']['opt_select'],$query['start']);
$result = ExecMethod2($query['search_method'],$query['search_values'],$only_keys,'','','','',$query['search_values']['opt_select'],false,'','',false);
$order_by,'',$query['search_values']['meth_select'],'',$query['search_values']['opt_select'],$query['start']);
$result = ExecMethod2($query['search_method'],$query['search_values'],$only_keys,
'','',$query['search_values']['meth_select'],'',$query['search_values']['opt_select'],false,'','',false);
// We store the result in session so actions can fetch them here:
$GLOBALS['egw']->session->appsession('advanced_search_result',$GLOBALS['egw_info']['flags']['currentapp'],$result);
return count($result);

2
etemplate/setup/phpgw_de.lang
View File

@ -72,6 +72,7 @@ comment etemplate de Kommentar
confirm etemplate de bestätigen
confirmation message or custom javascript (returning true or false) etemplate de Bestätigungsmeldung oder spezielles Javascript (true oder false zurücklieferned)
confirmation necesary or custom java-script etemplate de Bestätigung notwendig oder spezielles Javascript
contains etemplate de enthalten
create a new table for the application etemplate de Neue Tabelle für die Anwendung anlegen
creates an english ('en') langfile from label and helptexts (for application in name) etemplate de erzeugt eine englische ('en') Sprachdatei aus den Beschriftungen und Hilfetexten (für die Anwendung in Name)
css class for the table-tag etemplate de CSS class der Tabelle
@ -244,6 +245,7 @@ of etemplate de von
onclick etemplate de onClick
only an other version found !!! etemplate de nur eine andere Version gefunden !!!
open the online help. etemplate de Öffnet die online Hilfe.
operator etemplate de Operator
optional note about the link etemplate de optionale Notiz zur Verknüpfung
options etemplate de Optionen
order to navigating by tab key through the form etemplate de Reihenfolger bei der Navigation mit der Tabulator Taste durch das Formular

2
etemplate/setup/phpgw_en.lang
View File

@ -72,6 +72,7 @@ comment etemplate en Comment
confirm etemplate en confirm
confirmation message or custom javascript (returning true or false) etemplate en confirmation message or custom javascript (returning true or false)
confirmation necesary or custom java-script etemplate en confirmation necesary or custom java-script
contains etemplate en contains
create a new table for the application etemplate en Create a new table for the application
creates an english ('en') langfile from label and helptexts (for application in name) etemplate en creates an english ('en') langfile from label and helptexts (for application in Name)
css class for the table-tag etemplate en CSS class for the table-tag
@ -244,6 +245,7 @@ of etemplate en of
onclick etemplate en onClick
only an other version found !!! etemplate en only an other Version found !!!
open the online help. etemplate en Open the online help.
operator etemplate en Operator
optional note about the link etemplate en optional note about the Link
options etemplate en Options
order to navigating by tab key through the form etemplate en Order to navigating by tab key through the form