Details
diff --git a/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java b/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
index ceccb4d..890fc79 100644
--- a/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
+++ b/src/java/azkaban/webapp/servlet/ProjectManagerServlet.java
@@ -936,20 +936,18 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
}
else {
page.add("flowid", flow.getId());
-
Node node = flow.getNode(jobName);
-
if (node == null) {
page.add("errorMsg", "Job " + jobName + " not found.");
}
else {
Props prop = projectManager.getProperties(project, node.getJobSource());
Props overrideProp = projectManager.getJobOverrideProperty(project, jobName);
- if(overrideProp == null) {
+ if (overrideProp == null) {
overrideProp = new Props();
}
Props comboProp = new Props(prop);
- for(String key : overrideProp.getKeySet()) {
+ for (String key : overrideProp.getKeySet()) {
comboProp.put(key, overrideProp.get(key));
}
page.add("jobid", node.getId());
@@ -958,7 +956,7 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
ArrayList<String> dependencies = new ArrayList<String>();
Set<Edge> inEdges = flow.getInEdges(node.getId());
if (inEdges != null) {
- for ( Edge dependency: inEdges ) {
+ for (Edge dependency: inEdges) {
dependencies.add(dependency.getSourceId());
}
}
@@ -969,7 +967,7 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
ArrayList<String> dependents = new ArrayList<String>();
Set<Edge> outEdges = flow.getOutEdges(node.getId());
if (outEdges != null) {
- for ( Edge dependent: outEdges ) {
+ for (Edge dependent: outEdges) {
dependents.add(dependent.getTargetId());
}
}
@@ -980,15 +978,15 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
// Resolve property dependencies
ArrayList<String> source = new ArrayList<String>();
String nodeSource = node.getPropsSource();
- if(nodeSource != null) {
+ if (nodeSource != null) {
source.add(nodeSource);
FlowProps parent = flow.getFlowProps(nodeSource);
- while(parent.getInheritedSource() != null) {
+ while (parent.getInheritedSource() != null) {
source.add(parent.getInheritedSource());
parent = flow.getFlowProps(parent.getInheritedSource());
}
}
- if(!source.isEmpty()) {
+ if (!source.isEmpty()) {
page.add("properties", source);
}
@@ -1006,7 +1004,8 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
}
catch (AccessControlException e) {
page.add("errorMsg", e.getMessage());
- } catch (ProjectManagerException e) {
+ }
+ catch (ProjectManagerException e) {
page.add("errorMsg", e.getMessage());
}
@@ -1042,7 +1041,6 @@ public class ProjectManagerServlet extends LoginAbstractAzkabanServlet {
}
else {
page.add("flowid", flow.getId());
-
Node node = flow.getNode(jobName);
if (node == null) {
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 95a2368..b77add2 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -83,7 +83,7 @@
<ol class="breadcrumb">
<li><a href="${context}/manager?project=${project.name}"><strong>Project</strong> $project.name</a></li>
<li><a href="${context}/manager?project=${project.name}&flow=${flowid}"><strong>Flow</strong> $flowid</a></li>
- <li><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}"><strong>Job</strong> $jobid</a></li>
+ <li class="active"><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}"><strong>Job</strong> $jobid</a></li>
</ol>
#set ($job_page="properties")
@@ -123,7 +123,7 @@
## Edit job modal.
- <div class="modal fade" id="job-edit-pane">
+ <div class="modal modal-wide fade" id="job-edit-pane">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -132,7 +132,7 @@
</div>
<div class="modal-body">
<h4>Job Essentials</h4>
- <dl>
+ <dl class="dl-horizontal">
<dt>Job Name</dt>
<dd id="jobName"></dd>
<dt>Job Type</dt>
diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index a7c5e34..b1c5554 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -255,7 +255,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
- <button type="button" class="btn btn-primary" id="remove-proxy-btn">Remove Proxy User</a>
+ <button type="button" class="btn btn-danger" id="remove-proxy-btn">Remove Proxy User</a>
</div>
</div>
</div>
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 543cc9a..73546c6 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -175,14 +175,14 @@
<h4 class="modal-title">Delete Project</h4>
</div>
<div class="modal-body">
- <p>Warning: This project will be deleted and may not be recoverable.</p>
+ <p><strong>Warning:</strong> This project will be deleted and may not be recoverable.</p>
</div>
<div class="modal-footer">
<form id="delete-form">
<input type="hidden" name="project" value="$project.name">
<input type="hidden" name="delete" value="true">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
- <button type="button" class="btn btn-danger" id="delete-btn">Yes</button>
+ <button type="button" class="btn btn-danger" id="delete-btn">Delete Project</button>
</form>
</div>
</div>
diff --git a/src/web/js/azkaban.schedule.panel.view.js b/src/web/js/azkaban.schedule.panel.view.js
index b869552..2e26845 100644
--- a/src/web/js/azkaban.schedule.panel.view.js
+++ b/src/web/js/azkaban.schedule.panel.view.js
@@ -72,9 +72,11 @@ azkaban.SchedulePanelView = Backbone.View.extend({
var successHandler = function(data) {
if (data.error) {
+ schedulePanelView.hideSchedulePanel();
messageDialogView.show("Error Scheduling Flow", data.message);
}
else {
+ schedulePanelView.hideSchedulePanel();
messageDialogView.show("Flow Scheduled", data.message,
function() {
window.location.href = scheduleURL;
