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

Make sure all selected accounts are there, even if preference would normally not include them

Browse Source
This commit is contained in:
Nathan Gray 2012-06-18 23:26:02 +00:00
parent 86e72a105e
commit 180453a303
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/inc/class.etemplate_widget_menupopup.inc.php
View File

@ -332,10 +332,10 @@ class etemplate_widget_menupopup extends etemplate_widget
$select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'];
// in case of readonly, we read/create only the needed entries, as reading accounts is expensive
if (!is_array($value) && strpos($value,',') !== false) $value = explode(',',$value);
if ($readonly || $select_pref == 'popup')
{
$no_lang = True;
if (!is_array($value) && strpos($value,',') !== false) $value = explode(',',$value);
foreach(is_array($value) ? $value : array($value) as $id)
{
$options[$id] = !$id && !is_numeric($rows) ? lang($rows) :
@ -374,6 +374,13 @@ class etemplate_widget_menupopup extends etemplate_widget
$options[$acc['account_id']] = self::accountInfo($acc['account_id'],$acc,$type2,$type=='both');
}
}
// Make sure all values are present, even if not normally sent (according to preferences)
$remaining = array_diff_key($value, $options);
foreach($remaining as $id)
{
$options[$id] = !$id && !is_numeric($rows) ? lang($rows) : self::accountInfo($id,null,$type2,$type=='both');
}
break;
case 'select-year': // options: #rows,#before(default=3),#after(default=2)