extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 02:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

* InfoLog: fixed storing of InfoLog site config: fields to exclude when copying or creating subs and load custom fields in index for types

Browse Source
This commit is contained in:
Ralf Becker 2013-07-04 15:49:38 +00:00
parent 8fca0d0f61
commit 44fdd53dd2
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
infolog/inc/class.infolog_ui.inc.php
View File

@ -2231,29 +2231,13 @@ class infolog_ui
$extra = array_intersect(explode(',',$content['responsible_edit']),array_keys($fields)); $extra = array_intersect(explode(',',$content['responsible_edit']),array_keys($fields));
$this->bo->responsible_edit = array_unique(array_merge($this->bo->responsible_edit,$extra)); $this->bo->responsible_edit = array_unique(array_merge($this->bo->responsible_edit,$extra));
} }
// some fields like id, uid, created, createdby, modified and modifiedby are excluded by default config::save_value('copy_excludefields', $content['copy_excludefields'] ? explode(',', $content['copy_excludefields']) : null, 'infolog');
foreach(array('copy_excludefields','sub_excludefields') as $name) config::save_value('sub_excludefields', $content['sub_excludefields'] ? explode(',', $content['sub_excludefields']) : array('*NONE*'), 'infolog');
{ config::save_value('responsible_edit', $this->bo->responsible_edit, 'infolog');
$efs = array_keys($name == 'sub_excludefields' ? $sub_excludefields : $excludefields); config::save_value('implicit_rights', $this->bo->implicit_rights = $content['implicit_rights'] == 'edit' ? 'edit' : 'read', 'infolog');
$this->bo->$name = array_unique(array_diff($this->bo->$name, $efs, // restore default from bo config::save_value('history', $this->bo->history = $content['history'], 'infolog');
$name == 'sub_excludefields' ? $this->bo->default_sub_excludefields : array())); config::save_value('index_load_cfs', implode(',', (array)$content['index_load_cfs']), 'infolog');
config::save_value('sub_prefix', $content['sub_prefix'], 'infolog');
if ($content[$name])
{
$this->bo->$name = array_merge($this->bo->$name, array_intersect((array)$content[$name], $efs));
}
elseif ($name == 'sub_excludefields' && !in_array('explicit-set',$this->bo->sub_excludefields))
{
$this->bo->sub_excludefields[] = 'explicit-set'; // otherwise we can NOT unset default info_des
}
}
config::save_value('copy_excludefields',$this->bo->copy_excludefields,'infolog');
config::save_value('sub_excludefields',$this->bo->sub_excludefields,'infolog');
config::save_value('responsible_edit',$this->bo->responsible_edit,'infolog');
config::save_value('implicit_rights',$this->bo->implicit_rights = $content['implicit_rights'] == 'edit' ? 'edit' : 'read','infolog');
config::save_value('history',$this->bo->history = $content['history'],'infolog');
config::save_value('index_load_cfs',$config_data['index_load_cfs'] = $content['index_load_cfs'],'infolog');
config::save_value('sub_prefix',$config_data['sub_prefix'] = $content['sub_prefix'],'infolog');
// Notifications // Notifications
$notifications =& $config[infolog_tracking::CUSTOM_NOTIFICATION]; $notifications =& $config[infolog_tracking::CUSTOM_NOTIFICATION];