You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/02/12 08:27:49 UTC

[03/12] tez git commit: TEZ-2079. Tez UI: trailing slash in timelineBaseUrl in ui should be handled. (Prakash Ramachandran via hitesh)

TEZ-2079. Tez UI: trailing slash in timelineBaseUrl in ui should be handled. (Prakash Ramachandran via hitesh)


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

Branch: refs/heads/TEZ-2003
Commit: 76436f4821ae3314e46cb902d617a3eb65781958
Parents: b336ca0
Author: Hitesh Shah <hi...@apache.org>
Authored: Wed Feb 11 11:54:11 2015 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Wed Feb 11 11:54:11 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                               | 1 +
 tez-ui/src/main/webapp/app/scripts/app.js | 6 ++++++
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/76436f48/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 950a0e3..a42b29b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -61,6 +61,7 @@ Release 0.6.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2079. Tez UI: trailing slash in timelineBaseUrl in ui should be handled. 
   TEZ-2069. Tez UI: appId should link to application in dag details view.
   TEZ-2063. Tez UI: Flaky log url in tasks table.
   TEZ-2062. Tez UI: Showing 50 elements not working properly.

http://git-wip-us.apache.org/repos/asf/tez/blob/76436f48/tez-ui/src/main/webapp/app/scripts/app.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/app.js b/tez-ui/src/main/webapp/app/scripts/app.js
index 69d6407..6ae5d2a 100644
--- a/tez-ui/src/main/webapp/app/scripts/app.js
+++ b/tez-ui/src/main/webapp/app/scripts/app.js
@@ -54,6 +54,12 @@ App.Configs = Em.Namespace.create();
 App.ready = function () {
   $.extend(App.env, App.Configs.envDefaults);
 
+  ["timelineBaseUrl", "RMWebUrl"].forEach(function(item) {
+    if (!!App.env[item]) {
+      App.env[item] = App.Helpers.misc.normalizePath(App.env[item]);
+    }
+  })
+
   App.ApplicationAdapter = App.TimelineRESTAdapter.extend({
     host: App.env.timelineBaseUrl
   });