extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Addressbook - Fix bug where private required custom fields could block saving the entry if they were not on their own tab

Browse Source
This commit is contained in:
nathangray 2017-04-13 09:25:47 -06:00
parent 68e4df3d22
commit 0a0530fe46
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2347,17 +2347,19 @@ window.egw_LAB.wait(function() {
$content['cat_id_tree'] = $content['cat_id']; $content['cat_id_tree'] = $content['cat_id'];
// Avoid setting conflicts with private custom fields // Avoid setting conflicts with private custom fields
if ($this->config['private_cf_tab']) $content['private_cfs'] = array();
foreach(Api\Storage\Customfields::get('addressbook', true) as $name => $cf)
{ {
$content['private_cfs'] = array(); if ($this->config['private_cf_tab'] && $cf['private'] && isset($content['#'.$name]))
foreach(Api\Storage\Customfields::get('addressbook', true) as $name => $cf)
{ {
if ($cf['private'] && isset($content['#'.$name])) $content['private_cfs']['#'.$name] = $content['#'.$name];
{ }
$content['private_cfs']['#'.$name] = $content['#'.$name]; else if ($cf['private'])
} {
$readonlys['private_cfs']['#'.$name] = true;
} }
} }
// how to display addresses // how to display addresses
$content['addr_format'] = $this->addr_format_by_country($content['adr_one_countryname']); $content['addr_format'] = $this->addr_format_by_country($content['adr_one_countryname']);
$content['addr_format2'] = $this->addr_format_by_country($content['adr_two_countryname']); $content['addr_format2'] = $this->addr_format_by_country($content['adr_two_countryname']);
@ -2414,7 +2416,7 @@ window.egw_LAB.wait(function() {
// disable not needed tabs // disable not needed tabs
$readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']); $readonlys['tabs']['cats'] = !($content['cat_tab'] = $this->config['cat_tab']);
$readonlys['tabs']['custom'] = !$this->customfields || $this->get_backend($content['id'],$content['owner']) == $this->so_accounts; $readonlys['tabs']['custom'] = !$this->customfields || $this->get_backend($content['id'],$content['owner']) == $this->so_accounts;
$readonlys['tabs']['custom_private'] = $readonlys['tabs']['custom'] || !$this->config['private_cf_tab']; $readonlys['tabs']['custom_private'] = $readonlys['tabs']['custom'] || !$this->config['private_cf_tab'] ? '__ALL__' : false;
$readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false; $readonlys['tabs']['distribution_list'] = !$content['distrib_lists'];#false;
$readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] || $readonlys['tabs']['history'] = $this->contact_repository != 'sql' || !$content['id'] ||
$this->account_repository != 'sql' && $content['account_id']; $this->account_repository != 'sql' && $content['account_id'];