extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

logic updates to advanced search

Browse Source
This commit is contained in:
Cornelius Weiß 2006-10-27 13:10:51 +00:00
parent bcb22e45ef
commit c431575d69
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addressbook/inc/class.uicontacts.inc.php
View File

@ -605,6 +605,10 @@ class uicontacts extends bocontacts
foreach ($query['search'] as $key => $value) { foreach ($query['search'] as $key => $value) {
if(!$value) unset($query['search'][$key]); if(!$value) unset($query['search'][$key]);
} }
if (empty($query['search'])) {
$query['search'] = '';
unset($advanced_search);
}
} }
$rows = parent::search($query['search'],$id_only ? array('id','org_name','n_family','n_given','n_fileas') : false, $rows = parent::search($query['search'],$id_only ? array('id','org_name','n_family','n_given','n_fileas') : false,
$order,'',$wildcard,false,$op,array((int)$query['start'],(int) $query['num_rows']),$query['col_filter']); $order,'',$wildcard,false,$op,array((int)$query['start'],(int) $query['num_rows']),$query['col_filter']);
@ -1280,8 +1284,8 @@ $readonlys['button[vcard]'] = true;
$response->addScript(" $response->addScript("
var index_link = window.opener.location; var index_link = window.opener.location;
window.opener.location= index_link; window.opener.location=index_link;
window.close(); xajax_eT_wrapper();
"); ");
return $response->getXML(); return $response->getXML();
@ -1312,6 +1316,10 @@ $readonlys['button[vcard]'] = true;
false => lang('exact'), false => lang('exact'),
); );
$index_nm = $GLOBALS['egw']->session->appsession($do_email ? 'email' : 'index','addressbook');
if (array_key_exists('meth_select',$index_nm['search'])) {
$content = $index_nm['search'];
}
// configure edit template as search dialog // configure edit template as search dialog
$readonlys['change_photo'] = true; $readonlys['change_photo'] = true;
$readonlys['fileas_type'] = true; $readonlys['fileas_type'] = true;