tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject [1/5] tez git commit: TEZ-2079. Tez UI: trailing slash in timelineBaseUrl in ui should be handled. (Prakash Ramachandran via hitesh)
Date Wed, 11 Feb 2015 20:22:35 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.6 e8610693f -> 94d00d483


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

(cherry picked from commit 76436f4821ae3314e46cb902d617a3eb65781958)


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

Branch: refs/heads/branch-0.6
Commit: 3eb60124b1269d0b32f783e07a2ed43e97b275e3
Parents: e861069
Author: Hitesh Shah <hitesh@apache.org>
Authored: Wed Feb 11 11:54:11 2015 -0800
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Wed Feb 11 12:21:51 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/3eb60124/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a8a00f5..1b72901 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,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/3eb60124/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
   });


Mime
View raw message