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

Addressbook: Fix required customfields were still required on advanced search dialog's "Extra private" tab

Browse Source
This commit is contained in:
nathan 2023-02-15 08:43:58 -07:00
parent a139d1e7d2
commit bac32f4bba
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -3433,13 +3433,24 @@ class addressbook_ui extends addressbook_bo
{
foreach($this->customfields as $name => $data)
{
if (substr($data['type'], 0, 6) == 'select' && !($data['rows'] > 1))
if(substr($data['type'], 0, 6) == 'select' && !($data['rows'] > 1))
{
if (!isset($content['#'.$name])) $content['#'.$name] = '';
if(!isset($data['values'][''])) $sel_options['#'.$name][''] = lang('Select one');
if(!isset($content['#' . $name]))
{
$content['#' . $name] = '';
}
if(!isset($data['values']['']))
{
$sel_options['#' . $name][''] = lang('Select one');
}
}
// Make them not required, otherwise you can't search
$this->tmpl->setElementAttribute('#' . $name, 'required', FALSE);
if($this->config['private_cf_tab'] == 'True' && $data['private'])
{
// Private CF tab results in a different ID, turn required off there too
$this->tmpl->setElementAttribute('private_cfs[#' . $name . ']', 'required', FALSE);
}
}
}
// configure edit template as search dialog