azkaban-uncached

Merge pull request #68 from davidzchen/graph_package Add

11/14/2013 10:58:58 PM

Details

diff --git a/src/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java b/src/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
index b1d78c9..669cff4 100644
--- a/src/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
+++ b/src/java/azkaban/webapp/servlet/LoginAbstractAzkabanServlet.java
@@ -64,9 +64,9 @@ public abstract class LoginAbstractAzkabanServlet extends AbstractAzkabanServlet
 		contextType.put(".jpeg", "image/jpeg");
 		contextType.put(".gif", "image/gif");
 		contextType.put(".jpg", "image/jpeg");
+		contextType.put(".tl", "text/dust-template");
 	}
 	
-	
 	private File webResourceDirectory = null;
 	
 	private MultipartParser multipartParser;
diff --git a/src/web/js/azkaban.exflow.view.js b/src/web/js/azkaban.exflow.view.js
index ea1e6c8..16f9635 100644
--- a/src/web/js/azkaban.exflow.view.js
+++ b/src/web/js/azkaban.exflow.view.js
@@ -648,12 +648,12 @@ var exNodeClickCallback = function(event) {
 	var jobId = event.currentTarget.jobid;
 	var attempt = event.currentTarget.attempt;
 	var requestURL = contextURL + "/manager?project=" + projectName + "&flow=" + flowId + "&job=" + jobId;
-	var visualizerURL = contextURL + "/visualizer?execid=" + execId + "&job=" + jobId + "&attempt=" + attempt;
+	var visualizerURL = contextURL + "/pigvisualizer?execid=" + execId + "&jobid=" + jobId + "&attempt=" + attempt;
 
 	var menu = [	
-			{title: "Open Job...", callback: function() {window.location.href=requestURL;}},
+			{title: "Open Job...", callback: function() {window.location.href = requestURL;}},
 			{title: "Open Job in New Window...", callback: function() {window.open(requestURL);}},
-			{title: "Open Job Visualizer...", callback: function() {window.open(visualizerURL);}}
+			{title: "Visualize Job...", callback: function() {window.location.href = visualizerURL;}}
 	];
 
 	contextMenuView.show(event, menu);
@@ -664,12 +664,12 @@ var exJobClickCallback = function(event) {
 	var jobId = event.currentTarget.jobid;
 	var attempt = event.currentTarget.attempt;
 	var requestURL = contextURL + "/manager?project=" + projectName + "&flow=" + flowId + "&job=" + jobId;
-	var visualizerURL = contextURL + "/visualizer?execid=" + execId + "&job=" + jobId + "&attempt=" + attempt;
+	var visualizerURL = contextURL + "/pigvisualizer?execid=" + execId + "&jobid=" + jobId + "&attempt=" + attempt;
 
 	var menu = [	
-			{title: "Open Job...", callback: function() {window.location.href=requestURL;}},
+			{title: "Open Job...", callback: function() {window.location.href = requestURL;}},
 			{title: "Open Job in New Window...", callback: function() {window.open(requestURL);}},
-			{title: "Open Job Visualizer...", callback: function() {window.open(visualizerURL);}}
+			{title: "Visualize Job...", callback: function() {window.location.href = visualizerURL;}}
 	];
 
 	contextMenuView.show(event, menu);