You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/05/09 01:32:16 UTC
nifi git commit: NIFI-1711 Client-side JS for proxy-friendly URLs.
This closes #316
Repository: nifi
Updated Branches:
refs/heads/0.x 0a76b88c0 -> b7da46ee0
NIFI-1711 Client-side JS for proxy-friendly URLs. This closes #316
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b7da46ee
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b7da46ee
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b7da46ee
Branch: refs/heads/0.x
Commit: b7da46ee028fb7bbf35f47f8d9a085e694ca0e9b
Parents: 0a76b88
Author: James Wing <jv...@gmail.com>
Authored: Thu Mar 31 10:58:02 2016 -0700
Committer: Matt Gilman <ma...@gmail.com>
Committed: Sun May 8 21:20:28 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/jsp/header.jsp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/b7da46ee/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
index c000284..60bc908 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
@@ -56,7 +56,6 @@
}
});
- var url = $$('#requestUrl').text();
var ref = $$('#ref').text();
// create the parameters
@@ -129,6 +128,7 @@
contentParameter['access_token'] = uiExtensionToken;
}
+ var url = window.location.origin + window.location.pathname;
window.location.href = url + '?' + $$.param($$.extend(contentParameter, params));
});
}
@@ -141,7 +141,6 @@
<span id="ref" class="hidden"><%= org.apache.nifi.util.EscapeUtils.escapeHtml(request.getParameter("ref")) %></span>
<span id="clusterNodeId" class="hidden"><%= request.getParameter("clusterNodeId") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getParameter("clusterNodeId")) %></span>
<span id="mode" class="hidden"><%= request.getParameter("mode") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getParameter("mode")) %></span>
- <span id="requestUrl" class="hidden"><%= org.apache.nifi.util.EscapeUtils.escapeHtml(request.getRequestURL().toString()) %></span>
<div id="content-viewer-message-dialog">
<div class="dialog-content" style="margin-top: -20px;">
<div id="content-viewer-message"></div>