azkaban-aplcache
Details
diff --git a/src/java/azkaban/webapp/servlet/ScheduleServlet.java b/src/java/azkaban/webapp/servlet/ScheduleServlet.java
index 855c0df..59b931c 100644
--- a/src/java/azkaban/webapp/servlet/ScheduleServlet.java
+++ b/src/java/azkaban/webapp/servlet/ScheduleServlet.java
@@ -69,6 +69,12 @@ public class ScheduleServlet extends LoginAbstractAzkabanServlet {
ajaxRemoveSched(req, ret, session.getUser());
}
}
+
+ if(ret.get("status") == ("success"))
+ setSuccessMessageInCookie(resp, (String) ret.get("message"));
+ else
+ setErrorMessageInCookie(resp, (String) ret.get("message"));
+
this.writeJSON(resp, ret);
}
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 3e2c673..57d0b4c 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -155,12 +155,12 @@
repeat every
<input id="period" type="text" size="2" value="1"/>
<select id="period_units">
- <option value="M">Months</option>
- <option value="w">Weeks</option>
<option value="d">Days</option>
<option value="h">Hours</option>
<option value="m">Minutes</option>
<option value="s">Seconds</option>
+ <option value="M">Months</option>
+ <option value="w">Weeks</option>
</select>
<!--input type="submit" name="schedule" value="Schedule"/-->
</div>
diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index d7b57eb..cc32319 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -3,6 +3,7 @@
<head>
#parse( "azkaban/webapp/servlet/velocity/style.vm" )
<script type="text/javascript" src="${context}/js/jquery/jquery.js"></script>
+ <script type="text/javascript" src="${context}/js/jqueryui/jquery-ui.custom.min.js"></script>
<script type="text/javascript" src="${context}/js/namespace.js"></script>
<script type="text/javascript" src="${context}/js/underscore-1.2.1-min.js"></script>
<script type="text/javascript" src="${context}/js/backbone-0.5.3-min.js"></script>
@@ -20,11 +21,22 @@
</script>
</head>
<body>
- #set($current_page="scheduledFlows")
+#set($current_page="scheduledFlows")
#parse( "azkaban/webapp/servlet/velocity/nav.vm" )
<div class="messaging"><p id="messageClose">X</p><p id="message"></p></div>
<div class="content">
+
+#if($errorMsg)
+ <div class="box-error-message">$errorMsg</div>
+#else
+#if($error_message != "null")
+ <div class="box-error-message">$error_message</div>
+#elseif($success_message != "null")
+ <div class="box-success-message">$success_message</div>
+#end
+#end
+
<div id="all-scheduledFlows-content">
<div class="section-hd">
<h2>Scheduled Flows</h2>
@@ -77,20 +89,7 @@
</tbody>
</table>
- <!--div id="pageSelection" class="nonjavascript">
- <ul>
-
- <li id="previous" class="first"><a href="${context}/history?page=${previous.page}&size=${previous.size}"><span class="arrow">←</span>Previous</a></li>
- <li id="page1" #if($page1.selected) class="selected" #end><a href="${context}/history?page=${page1.page}&size=${page1.size}">${page1.page}</a></li>
- <li id="page2" #if($page2.selected) class="selected" #end><a href="${context}/history?page=${page2.page}&size=${page2.size}">${page2.page}</a></li>
- <li id="page3" #if($page3.selected) class="selected" #end><a href="${context}/history?page=${page3.page}&size=${page3.size}">${page3.page}</a></li>
- <li id="page4" #if($page4.selected) class="selected" #end><a href="${context}/history?page=${page4.page}&size=${page4.size}">${page4.page}</a></li>
- <li id="page5" #if($page5.selected) class="selected" #end><a href="${context}/history?page=${page5.page}&size=${page5.size}">${page5.page}</a></li>
-
- <li id="next"><a href="${context}/history?page=${next.page}&size=${next.size}">Next<span class="arrow">→</span></a></li>
- </ul>
- </div-->
</div>
</div>
</body>
src/web/js/azkaban.flow.view.js 4(+1 -3)
diff --git a/src/web/js/azkaban.flow.view.js b/src/web/js/azkaban.flow.view.js
index c204351..9555055 100644
--- a/src/web/js/azkaban.flow.view.js
+++ b/src/web/js/azkaban.flow.view.js
@@ -900,12 +900,10 @@ azkaban.ScheduleFlowView = Backbone.View.extend({
if (data.status == "success") {
console.log("Successfully scheduled for "+projectName+"."+flowName);
if (data.action == "redirect") {
- //window.location = data.path;
window.loaction = contextURL + "/manager?project=" + projectName + "&flow=" + flowName ;
}
else{
- $("#errorMsg").text("Flow " + projectName + "." + flowName + " scheduled!" );
- alert("Flow " + projectName + "." + flowName + " scheduled!");
+ $("#success_message").text("Flow " + projectName + "." + flowName + " scheduled!" );
window.location = contextURL + "/manager?project=" + projectName + "&flow=" + flowName ;
}
}
src/web/js/azkaban.scheduled.view.js 7(+4 -3)
diff --git a/src/web/js/azkaban.scheduled.view.js b/src/web/js/azkaban.scheduled.view.js
index 258f1e5..e035d63 100644
--- a/src/web/js/azkaban.scheduled.view.js
+++ b/src/web/js/azkaban.scheduled.view.js
@@ -8,11 +8,12 @@ function removeSched(schedId) {
{"action":"removeSched", "scheduleId":schedId},
function(data) {
if (data.error) {
- alert(data.error)
+// alert(data.error)
+ $('#errorMsg').text(data.error)
}
else {
- alert("Schedule "+schedId+" removed!")
- window.location=redirectURL
+// alert("Schedule "+schedId+" removed!")
+ window.location = redirectURL
}
},
"json"