extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Can't use Framework::ajax_user_list(), it sends its data which conflicts with export wizard

Browse Source
This commit is contained in:
nathan 2023-08-04 14:45:56 -06:00
parent dfc30a37d1
commit ad2096866e
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
calendar/inc/class.calendar_owner_etemplate_widget.inc.php
View File

@ -64,14 +64,35 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
} }
else else
{ {
$accounts = Framework::ajax_user_list(); // close session now, to not block other user actions
$GLOBALS['egw']->session->commit_session();
$list = array('accounts' => array('num_rows' => Link::DEFAULT_NUM_ROWS), 'groups' => array(),
'owngroups' => array());
if($type == "primary_groups") if($type == "primary_groups")
{ {
unset($accounts['groups']); unset($list['groups']);
} }
else else
{ {
unset($accounts['owngroups']); unset($list['owngroups']);
}
if($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'primary_group')
{
$list['accounts']['filter']['group'] = $GLOBALS['egw_info']['user']['account_primary_group'];
}
foreach($list as $type => &$accounts)
{
$options = array('account_type' => $type, 'tag_list' => true) + $accounts;
$accounts = Accounts::link_query('', $options);
}
unset($list["accounts"][9]);
// Make sure the user themselves is in there
if(!array_key_exists($GLOBALS['egw_info']['user']['account_id'], $list['accounts']))
{
$options = array('account_type' => 'accounts', 'tag_list' => true,
'account_id' => $GLOBALS['egw_info']['user']['account_id']) + $list['accounts'];
$list['accounts'] += Accounts::link_query('', $options);
} }
} }
foreach($accounts as $type_account_list) foreach($accounts as $type_account_list)