You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2018/07/02 20:32:44 UTC
[27/45] hadoop git commit: YARN-8469. [UI2] URL needs to be trimmed
to handle index.html redirection while accessing via knox. Contributed by
Sunil Govindan.
YARN-8469. [UI2] URL needs to be trimmed to handle index.html redirection while accessing via knox. Contributed by Sunil Govindan.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a820738e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a820738e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a820738e
Branch: refs/heads/HDDS-4
Commit: a820738e347854aed7cdaa7758d9c0830df624e3
Parents: 469b29c
Author: Rohith Sharma K S <ro...@apache.org>
Authored: Fri Jun 29 10:21:25 2018 -0700
Committer: Rohith Sharma K S <ro...@apache.org>
Committed: Fri Jun 29 10:21:25 2018 -0700
----------------------------------------------------------------------
.../src/main/webapp/app/initializers/loader.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a820738e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
index 6642869..96c8fcf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/initializers/loader.js
@@ -205,5 +205,13 @@ export default {
const skipTrailingSlash = function(path) {
path = path.replace('ui2/', '');
- return path.replace(/\/$/, '');
+ path = path.replace(/\/$/, '');
+ console.log('base url:' + path)
+ if(path.includes("redirect")) {
+ var to = path.lastIndexOf('/');
+ to = to == -1 ? path.length : to + 1;
+ path = path.substring(0, to);
+ console.log('base url after redirect:' + path)
+ }
+ return path;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org