You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ap...@apache.org on 2013/07/25 13:57:06 UTC

[28/50] git commit: updated refs/heads/ldapplugin to 1f64354

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

Branch: refs/heads/ldapplugin
Commit: e12e0f793b1c75e5d7819c3067ced1843b83f7bf
Parents: bcfe4c2
Author: Brian Federle <br...@citrix.com>
Authored: Wed Jul 24 11:49:30 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Jul 24 11:49:30 2013 -0700

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


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