holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed account-selection-type "primary_group" to only show membership-groups by default

Browse Source
This commit is contained in:
Ralf Becker 2015-03-10 16:06:22 +00:00
parent 8ec7d08589
commit 4c82f2cee2
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etemplate/js/et2_widget_selectAccount.js
View File

@ -380,7 +380,22 @@ var et2_selectAccount = et2_selectbox.extend(
} }
} }
} }
return this.options.select_options.concat(this.egw().accounts(this.options.account_type)); var type = this.egw().preference('account_selection', 'common');
var accounts = [];
// for primary_group we only display owngroups == own memberships, not other groups
if (type == 'primary_group' && this.options.account_type != 'accounts')
{
if (this.options.account_type == 'both')
{
accounts = this.egw().accounts('accounts');
}
accounts = accounts.concat(this.egw().accounts('owngroups'));
}
else
{
accounts = this.egw().accounts(this.options.account_type);
}
return this.options.select_options.concat(accounts);
}, },
/** /**

1
phpgwapi/inc/class.accounts.inc.php
View File

@ -392,6 +392,7 @@ class accounts
case 'groups': case 'groups':
$type = $only_own ? 'memberships' : 'groups'; $type = $only_own ? 'memberships' : 'groups';
break; break;
case 'owngroups':
case 'groupmembers': case 'groupmembers':
case 'memberships': case 'memberships':
$type = $options['account_type']; $type = $options['account_type'];