cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/4.2 to e03f7f4
Date Wed, 24 Jul 2013 18:49:59 GMT
Updated Branches:
  refs/heads/4.2 585fdd978 -> e03f7f4db


CLOUDSTACK-3344: Add LDAP: Fix encoding of '&' character


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

Branch: refs/heads/4.2
Commit: e03f7f4db3c23eb5e4b72e62aa8fefd54f1c2355
Parents: 585fdd9
Author: Brian Federle <brian.federle@citrix.com>
Authored: Wed Jul 24 11:49:30 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Jul 24 11:49:56 2013 -0700

----------------------------------------------------------------------
 ui/scripts/globalSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e03f7f4d/ui/scripts/globalSettings.js
----------------------------------------------------------------------
diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js
index 973f07a..c23c5f8 100644
--- a/ui/scripts/globalSettings.js
+++ b/ui/scripts/globalSettings.js
@@ -298,7 +298,7 @@
                                 array.push("&bindpass=" + todb(args.data.password));
                                 array.push("&hostname=" + todb(args.data.hostname));
                                 array.push("&searchbase=" + todb(args.data.searchbase));
-                                array.push("&queryfilter=" + todb(args.data.queryfilter));
+                                array.push("&queryfilter=" + todb(args.data.queryfilter).replace('&amp;',
'%26'));
                                 array.push("&port=" + todb(args.data.port));
 
                                 if (args.$form.find('.form-item[rel=ssl]').find('input[type=checkbox]').is(':Checked')
== true) {


Mime
View raw message