ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject ambari git commit: AMBARI-14785. Hive View: "NO DAG Available" on TEZ tab when ambari is running behind proxy. (Gaurav Nagar via yusaku)
Date Tue, 26 Jan 2016 02:23:56 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 389f3f4a3 -> 9a53f8db9


AMBARI-14785. Hive View: "NO DAG Available" on TEZ tab when ambari is running behind proxy.
(Gaurav Nagar via yusaku)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a53f8db
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a53f8db
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a53f8db

Branch: refs/heads/branch-2.1.2
Commit: 9a53f8db968ddd2c81d2a73893dc9d2f665a6c3b
Parents: 389f3f4
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Mon Jan 25 18:05:20 2016 -0800
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Mon Jan 25 18:23:48 2016 -0800

----------------------------------------------------------------------
 .../src/main/resources/ui/hive-web/app/controllers/tez-ui.js    | 2 +-
 .../src/main/resources/ui/hive-web/tests/helpers/api-mock.js    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9a53f8db/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/tez-ui.js
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/tez-ui.js b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/tez-ui.js
index 18379a0..43835e0 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/tez-ui.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/tez-ui.js
@@ -64,7 +64,7 @@ export default Ember.Controller.extend({
 
   getTezViewInstance: function (data) {
     var self = this;
-    var url = data.versions[0].href;
+    var url = this.get('tezApiURL') + '/versions/' + data.versions[0].ViewVersionInfo.version;
 
     Ember.$.getJSON(url)
       .then(function (response) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/9a53f8db/contrib/views/hive/src/main/resources/ui/hive-web/tests/helpers/api-mock.js
----------------------------------------------------------------------
diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/tests/helpers/api-mock.js b/contrib/views/hive/src/main/resources/ui/hive-web/tests/helpers/api-mock.js
index 2898863..ed4822d 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/tests/helpers/api-mock.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/tests/helpers/api-mock.js
@@ -265,7 +265,8 @@ export default function() {
     var data = {
       versions: [
         {
-          href: baseUrl + '/api/v1/view/TEZ/instanceURL'
+          href: baseUrl + '/api/v1/view/TEZ/versions/1',
+          ViewVersionInfo: {version: '1', view_name: 'TEZ'}
         }
       ]
     };
@@ -273,7 +274,7 @@ export default function() {
     return [200, {"Content-Type": "application/json"}, JSON.stringify(data)];
   });
 
-  this.get(baseUrl + '/api/v1/views/TEZ/instanceURL', function (req) {
+  this.get(baseUrl + '/api/v1/views/TEZ/versions/1', function (req) {
     var data = {
       instances: [
         {


Mime
View raw message