cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [13/18] git commit: updated refs/heads/4.3 to b8a28df
Date Tue, 25 Nov 2014 14:51:49 GMT
CLOUDSTACK-7463: UI: Domain Admin UI shows 'Add LDAP Users' button (should not be shown)

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c200ada863dd4a7d5659538e4378c77a3e89d597)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

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/898b2e70
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/898b2e70
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/898b2e70

Branch: refs/heads/4.3
Commit: 898b2e700e91e127ce89709bdf85500494e88fd1
Parents: dc80b25
Author: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
Authored: Tue Sep 2 10:26:54 2014 +0100
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Tue Nov 25 19:29:47 2014 +0530

----------------------------------------------------------------------
 ui/scripts/accounts.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/898b2e70/ui/scripts/accounts.js
----------------------------------------------------------------------
diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js
index a15cc87..9d62f72 100644
--- a/ui/scripts/accounts.js
+++ b/ui/scripts/accounts.js
@@ -97,7 +97,8 @@
                             label: 'Add LDAP Account',
                             isHeader: true,
                             preFilter: function(args) {
-                                if ((isAdmin() || isDomainAdmin()) && isLdapEnabled())
{
+                                //if (isAdmin() && true) { //for testing only
+                                if (isAdmin() && isLdapEnabled()) {
                                     return true;
                                 } else {
                                     return false;


Mime
View raw message