mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-13 17:38:19 +01:00
Fix account selection missing members of non-primary groups
This commit is contained in:
parent
aca00c49f7
commit
c1689c7328
@ -475,7 +475,7 @@ class etemplate_widget_menupopup extends etemplate_widget
|
|||||||
{
|
{
|
||||||
$type = $widget->attrs['account_type'];
|
$type = $widget->attrs['account_type'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$select_pref = $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'];
|
$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
|
// 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 (!is_array($value) && strpos($value,',') !== false) $value = explode(',',$value);
|
||||||
@ -505,6 +505,7 @@ class etemplate_widget_menupopup extends etemplate_widget
|
|||||||
if($select_pref == 'popup') break;
|
if($select_pref == 'popup') break;
|
||||||
|
|
||||||
$no_lang = True;
|
$no_lang = True;
|
||||||
|
$accs = array();
|
||||||
if(!$mygroups)
|
if(!$mygroups)
|
||||||
{
|
{
|
||||||
$accs = $GLOBALS['egw']->accounts->search(array(
|
$accs = $GLOBALS['egw']->accounts->search(array(
|
||||||
@ -516,7 +517,7 @@ class etemplate_widget_menupopup extends etemplate_widget
|
|||||||
{
|
{
|
||||||
foreach($mygroups as $group)
|
foreach($mygroups as $group)
|
||||||
{
|
{
|
||||||
$accs = $GLOBALS['egw']->accounts->search(array(
|
$accs += $GLOBALS['egw']->accounts->search(array(
|
||||||
'type' => $group,
|
'type' => $group,
|
||||||
'order' => 'account_fullname', // order according to pref of how to display accounts
|
'order' => 'account_fullname', // order according to pref of how to display accounts
|
||||||
));
|
));
|
||||||
|
Loading…
Reference in New Issue
Block a user