cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject git commit: updated refs/heads/master to c200ada
Date Tue, 02 Sep 2014 10:40:15 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 51e0488e5 -> c200ada86


CLOUDSTACK-7463: UI: Domain Admin UI shows 'Add LDAP Users' button (should not be shown)

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c200ada8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c200ada8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c200ada8

Branch: refs/heads/master
Commit: c200ada863dd4a7d5659538e4378c77a3e89d597
Parents: 51e0488
Author: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
Authored: Tue Sep 2 10:26:54 2014 +0100
Committer: Rajani Karuturi <rajanikaruturi@gmail.com>
Committed: Tue Sep 2 16:09:38 2014 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c200ada8/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;


Mime
View raw message