From a78f2c874b9b5a75421ed4c568f6c02c977557d0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 30 Jan 2015 11:30:03 +0000 Subject: [PATCH] * Admin: fix not working setting of ACL for account-selection "select-box with primary group and search", data from contains no selection --- admin/js/app.js | 22 +--------------------- admin/templates/default/acl.xet | 2 +- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/admin/js/app.js b/admin/js/app.js index 47070b2d1f..17106a54a0 100644 --- a/admin/js/app.js +++ b/admin/js/app.js @@ -518,27 +518,7 @@ app.classes.admin = AppJS.extend( } } - // Make sure selected values are there, account might not be in a default group - // 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) + if(content.acl_account && !egw.user('apps')['admin']) { readonlys.acl_account = true; } diff --git a/admin/templates/default/acl.xet b/admin/templates/default/acl.xet index 9ad21516e9..96d9698b9b 100644 --- a/admin/templates/default/acl.xet +++ b/admin/templates/default/acl.xet @@ -2,7 +2,7 @@