extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 15:59:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

select-account: default label will be added on clientside, it doubles, if added here too

Browse Source
This commit is contained in:
Ralf Becker 2013-11-06 10:31:57 +00:00
parent 90a9df3d1e
commit 1c7c699d4f
1 changed files with 5 additions and 4 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

@ -402,9 +402,7 @@ class etemplate_widget_menupopup extends etemplate_widget
$no_lang = True; $no_lang = True;
break; break;
case 'select-account': // options: #rows,{accounts(default)|both|groups|owngroups},{0(=lid)|1(default=name)|2(=lid+name),expand-multiselect-rows,not-to-show-accounts,...)} case 'select-account': // options: #rows,{accounts(default)|both|groups|owngroups},{0(=lid)|1(default=name)|2(=lid+name),expand-multiselect-rows,not-to-show-accounts,...)}
// Get preference for selection display // Get preference for selection display
$select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection']; $select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'];
@ -455,13 +453,16 @@ class etemplate_widget_menupopup extends etemplate_widget
// Make sure all values are present, even if not normally sent (according to preferences) // Make sure all values are present, even if not normally sent (according to preferences)
if(is_array($value)) if(is_array($value))
{ {
$remaining = array_diff_key($value, $options); $remaining = array_diff($value, array_keys($options));
} }
if(is_array($remaining)) if(is_array($remaining))
{ {
foreach($remaining as $id) foreach($remaining as $id)
{ {
$options[$id] = !$id && !is_numeric($rows) ? lang($rows) : self::accountInfo($id,null,$type2,$type=='both'); if ($id) // default label will be added on clientside, it doubles, if added here too
{
$options[$id] = self::accountInfo($id,null,$type2,$type=='both');
}
} }
} }
break; break;