tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeag...@apache.org
Subject [48/53] tez git commit: TEZ-1799. Enable Cross Origin Support in Tez UI (jeagles)
Date Wed, 10 Dec 2014 03:34:11 GMT
TEZ-1799. Enable Cross Origin Support in Tez UI (jeagles)


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

Branch: refs/heads/master
Commit: 51a4f49cbda204338753909a2fcbea7ea7a7d871
Parents: 6a65387
Author: Jonathan Eagles <jeagles@gmail.com>
Authored: Tue Dec 2 13:25:03 2014 -0600
Committer: Jonathan Eagles <jeagles@gmail.com>
Committed: Tue Dec 2 13:25:03 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 tez-ui/src/main/webapp/app/scripts/app.js                      | 6 ++++++
 .../src/main/webapp/app/scripts/models/TimelineRestAdapter.js  | 6 ++++++
 3 files changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/51a4f49c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b0c3c41..8249d71 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.6.0: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-1799. Enable Cross Origin Support in Tez UI
   TEZ-1634. Fix compressed IFile shuffle errors
   TEZ-1615. Skeleton framework for Tez UI
   TEZ-1604. Task View for Tez UI

http://git-wip-us.apache.org/repos/asf/tez/blob/51a4f49c/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 b6d628e..43aad3c 100644
--- a/tez-ui/src/main/webapp/app/scripts/app.js
+++ b/tez-ui/src/main/webapp/app/scripts/app.js
@@ -48,6 +48,12 @@ Ember.Application.initializer({
     application.ApplicationSerializer = App.TimelineSerializer.extend();
 
     application.AppDetailAdapter = DS.RESTAdapter.extend({
+      ajax: function(url, method, hash) {
+        hash = hash || {}; // hash may be undefined
+        hash.crossDomain = true;
+        hash.xhrFields = {withCredentials: true};
+        return this._super(url, method, hash);
+      },
       namespace: App.Configs.restNamespace.applicationHistory,
       host: App.env.timelineBaseUrl,
       pathForType: function() {

http://git-wip-us.apache.org/repos/asf/tez/blob/51a4f49c/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js b/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
index 841e188..d5d5858 100644
--- a/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
+++ b/tez-ui/src/main/webapp/app/scripts/models/TimelineRestAdapter.js
@@ -24,6 +24,12 @@ var typeToPathMap = {
 };
 
 App.TimelineRESTAdapter = DS.RESTAdapter.extend({
+  ajax: function(url, method, hash) {
+    hash = hash || {}; // hash may be undefined
+    hash.crossDomain = true;
+    hash.xhrFields = {withCredentials: true};
+    return this._super(url, method, hash);
+  },
 	namespace: App.Configs.restNamespace.timeline,
 	pathForType: function(type) {
 		return typeToPathMap[type];


Mime
View raw message