CLOUDSTACK-7463: UI: Domain Admin UI shows 'Add LDAP Users' button (should not be shown)
Signed-off-by: Rajani Karuturi <[email protected]> (cherry picked from commit c200ada863dd4a7d5659538e4378c77a3e89d597) Signed-off-by: Rohit Yadav <[email protected]> Conflicts: ui/scripts/accounts.js Conflicts: ui/scripts/accounts.js Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23b31982 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23b31982 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23b31982 Branch: refs/heads/4.4 Commit: 23b3198233f0380eb248dfb8da26f972f75b19c9 Parents: 9bd2749 Author: Gabor Apati-Nagy <[email protected]> Authored: Tue Sep 2 10:26:54 2014 +0100 Committer: Rohit Yadav <[email protected]> Committed: Thu Dec 11 20:38:19 2014 +0530 ---------------------------------------------------------------------- ui/scripts/accounts.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23b31982/ui/scripts/accounts.js ---------------------------------------------------------------------- diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 2ebfe82..cc4624a 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -96,8 +96,8 @@ label: 'Add LDAP Account', isHeader: true, preFilter: function(args) { - //if ((isAdmin() || isDomainAdmin()) && true) { //for testing only - if ((isAdmin() || isDomainAdmin()) && isLdapEnabled()) { + //if (isAdmin() && true) { //for testing only + if (isAdmin() && isLdapEnabled()) { return true; } else { return false;
