azkaban-uncached
Changes
src/tl/flowsummary.tl 4(+3 -1)
Details
diff --git a/src/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java b/src/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
index f7a5184..8ac470e 100644
--- a/src/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
+++ b/src/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
@@ -55,7 +55,7 @@ public abstract class AbstractAzkabanServlet extends HttpServlet {
public static final String XML_MIME_TYPE = "application/xhtml+xml";
public static final String JSON_MIME_TYPE = "application/json";
- private static final WebUtils utils = new WebUtils();
+ protected static final WebUtils utils = new WebUtils();
private AzkabanServer application;
private String name;
diff --git a/src/java/azkaban/webapp/servlet/ScheduleServlet.java b/src/java/azkaban/webapp/servlet/ScheduleServlet.java
index 9a4ea4e..c373608 100644
--- a/src/java/azkaban/webapp/servlet/ScheduleServlet.java
+++ b/src/java/azkaban/webapp/servlet/ScheduleServlet.java
@@ -245,9 +245,11 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
Map<String, String> jsonObj = new HashMap<String, String>();
jsonObj.put("scheduleId", Integer.toString(schedule.getScheduleId()));
jsonObj.put("submitUser", schedule.getSubmitUser());
- jsonObj.put("firstSchedTime", Long.toString(schedule.getFirstSchedTime()));
- jsonObj.put("nextExecTime", Long.toString(schedule.getNextExecTime()));
- jsonObj.put("period", schedule.getPeriod().toString());
+ jsonObj.put("firstSchedTime",
+ utils.formatDateTime(schedule.getFirstSchedTime()));
+ jsonObj.put("nextExecTime",
+ utils.formatDateTime(schedule.getNextExecTime()));
+ jsonObj.put("period", utils.formatPeriod(schedule.getPeriod()));
ret.put("schedule", jsonObj);
}
}
src/tl/flowsummary.tl 4(+3 -1)
diff --git a/src/tl/flowsummary.tl b/src/tl/flowsummary.tl
index b117f8a..7e42852 100644
--- a/src/tl/flowsummary.tl
+++ b/src/tl/flowsummary.tl
@@ -50,7 +50,9 @@
{:else}
false
{/schedule.slaOptions}
- <button type="button" id="addSlaBtn" class="btn btn-xs btn-primary" onclick="slaView.initFromSched({schedule.scheduleId}, '{flowName}')" >Set SLA</button>
+ <div class="pull-right">
+ <button type="button" id="addSlaBtn" class="btn btn-xs btn-primary" onclick="slaView.initFromSched({schedule.scheduleId}, '{flowName}')" >Set SLA</button>
+ </div>
</td>
</tr>
</tbody>