azkaban-uncached

fix flow parameter not passed in

5/20/2013 11:04:07 PM

Details

diff --git a/src/java/azkaban/executor/ExecutionOptions.java b/src/java/azkaban/executor/ExecutionOptions.java
index a91a6d0..687dd71 100644
--- a/src/java/azkaban/executor/ExecutionOptions.java
+++ b/src/java/azkaban/executor/ExecutionOptions.java
@@ -40,7 +40,7 @@ public class ExecutionOptions {
 	private Set<String> initiallyDisabledJobs = new HashSet<String>();
 	
 	public void setFlowParameters(Map<String,String> flowParam) {
-		flowParameters.get(flowParam);
+		flowParameters.putAll(flowParam);
 	}
 	
 	public Map<String,String> getFlowParameters() {
diff --git a/src/web/js/azkaban.jobedit.view.js b/src/web/js/azkaban.jobedit.view.js
index d8ee5e0..64fbbc8 100644
--- a/src/web/js/azkaban.jobedit.view.js
+++ b/src/web/js/azkaban.jobedit.view.js
@@ -193,6 +193,9 @@ azkaban.JobEditView = Backbone.View.extend({
 			
 			this.editingTarget = curTarget;
 		}
+
+		evt.preventDefault();
+		evt.stopPropagation();
 	},
 	handleRemoveColumn : function(evt) {
 		var curTarget = evt.currentTarget;