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

* Admin: fix not working setting of ACL for account-selection "select-box with primary group and search", data from contains no selection

Browse Source
This commit is contained in:
Ralf Becker 2015-01-30 11:30:03 +00:00
parent 01902cc40e
commit a78f2c874b
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
admin/js/app.js
View File

@ -518,27 +518,7 @@ app.classes.admin = AppJS.extend(
} }
} }
// Make sure selected values are there, account might not be in a default group if(content.acl_account && !egw.user('apps')['admin'])
// so not in cache
if(content.acl_account && egw.user('apps')['admin'])
{
var accounts = this.egw.accounts('both');
var there = false;
for(var i = 0; i < accounts.length; i++)
{
if(accounts[i].value == content.acl_account)
{
there = true;
break;
}
}
if(!there)
{
sel_options.acl_account = new Array().concat(sel_options.acl_account);
this.egw.link_title('home-accounts', content.acl_account, function(title) {sel_options.acl_account.push({value: content.acl_account, label: title});});
}
}
else if (content.acl_account)
{ {
readonlys.acl_account = true; readonlys.acl_account = true;
} }

2
admin/templates/default/acl.xet
View File

@ -2,7 +2,7 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="admin.acl.add" template="" lang="" group="0" version="1.9.001"> <template id="admin.acl.add" template="" lang="" group="0" version="1.9.001">
<buttononly label="Add" id="add" onclick='app.admin.acl({id:"add"},{0:{id:""}})'/> <buttononly label="Add" id="add" onclick='app.admin.acl({id:"add"},[{id:""}])'/>
</template> </template>
<template id="admin.acl.rows" template="" lang="" group="0" version="1.9.001"> <template id="admin.acl.rows" template="" lang="" group="0" version="1.9.001">
<grid width="100%"> <grid width="100%">