Repository: tez Updated Branches: refs/heads/master f6a40b659 -> 9dce51011
TEZ-2960. Tez UI: Move hardcoded url namespace to the configuration file (sree) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/9dce5101 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/9dce5101 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/9dce5101 Branch: refs/heads/master Commit: 9dce5101170893066d788e8a1a96bbc8672dc5b9 Parents: f6a40b6 Author: Sreenath Somarajapuram <s...@apache.org> Authored: Wed Dec 2 11:22:33 2015 +0530 Committer: Sreenath Somarajapuram <s...@apache.org> Committed: Wed Dec 2 11:22:33 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../webapp/app/scripts/controllers/tez-app-index-controller.js | 2 +- tez-ui/src/main/webapp/app/scripts/default-configs.js | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/9dce5101/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index b9a91f8..c1da620 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ INCOMPATIBLE CHANGES TEZ-2949. Allow duplicate dag names within session for Tez. ALL CHANGES: + TEZ-2960. Tez UI: Move hardcoded url namespace to the configuration file TEZ-2581. Umbrella for Tez Recovery Redesign TEZ-2956. Handle auto-reduce parallelism when the totalNumBipartiteSourceTasks is 0 http://git-wip-us.apache.org/repos/asf/tez/blob/9dce5101/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-index-controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-index-controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-index-controller.js index a4dc372..ae1df85 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-index-controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/tez-app-index-controller.js @@ -22,7 +22,7 @@ App.TezAppIndexController = App.PollingController.extend(App.ModelRefreshMixin, controllerName: 'TezAppIndexController', rmTrackingURL: function() { - return App.env.RMWebUrl + '/cluster/app/' + this.get('appId'); + return "%@/%@/app/%@".fmt(App.env.RMWebUrl, App.Configs.otherNamespace.cluster, this.get('appId')); }.property('appId'), load: function () { http://git-wip-us.apache.org/repos/asf/tez/blob/9dce5101/tez-ui/src/main/webapp/app/scripts/default-configs.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/default-configs.js b/tez-ui/src/main/webapp/app/scripts/default-configs.js index 93556aa..dbdf707 100644 --- a/tez-ui/src/main/webapp/app/scripts/default-configs.js +++ b/tez-ui/src/main/webapp/app/scripts/default-configs.js @@ -53,6 +53,10 @@ $.extend(true, App.Configs, { cluster: 'ws/v1/cluster' }, + otherNamespace: { + cluster: 'cluster', + }, + tables: { entity: { dag: [