azkaban-memoizeit
Changes
src/tl/flowstats.tl 0(+0 -0)
src/tl/flowstats-no-data.tl 2(+1 -1)
src/tl/Makefile 4(+2 -2)
src/web/js/azkaban.flow.view.js 2(+1 -1)
Details
diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index a0fe230..75bd7d0 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -25,9 +25,8 @@
<script type="text/javascript" src="${context}/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="${context}/js/dust-full-2.2.3.min.js"></script>
- <script type="text/javascript" src="${context}/js/flowsummary.js"></script>
- <script type="text/javascript" src="${context}/js/flowsummary-no-data.js"></script>
- <script type="text/javascript" src="${context}/js/flowsummary-last-run.js"></script>
+ <script type="text/javascript" src="${context}/js/flowstats.js"></script>
+ <script type="text/javascript" src="${context}/js/flowstats-no-data.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.common.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
index 9543613..14efd81 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
@@ -199,7 +199,7 @@
#end
*#
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
- <button type="button" class="btn btn-success" id="execute-btn">Execute</button>
+ <button type="button" class="btn btn-primary" id="execute-btn">Execute</button>
</div><!-- /modal-footer -->
</div><!-- /modal-content -->
</div><!-- /modal-dialog -->
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 89cdcf9..af64cd7 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -26,8 +26,8 @@
<script type="text/javascript" src="${context}/js/dust-full-2.2.3.min.js"></script>
<script type="text/javascript" src="${context}/js/flowsummary.js"></script>
- <script type="text/javascript" src="${context}/js/flowsummary-no-data.js"></script>
- <script type="text/javascript" src="${context}/js/flowsummary-last-run.js"></script>
+ <script type="text/javascript" src="${context}/js/flowstats-no-data.js"></script>
+ <script type="text/javascript" src="${context}/js/flowstats.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.date.utils.js"></script>
<script type="text/javascript" src="${context}/js/azkaban.ajax.utils.js"></script>
src/tl/Makefile 4(+2 -2)
diff --git a/src/tl/Makefile b/src/tl/Makefile
index f559ce3..a9c8028 100644
--- a/src/tl/Makefile
+++ b/src/tl/Makefile
@@ -1,8 +1,8 @@
OBJ_DIR = obj
OBJ = \
$(OBJ_DIR)/flowsummary.js \
- $(OBJ_DIR)/flowsummary-no-data.js \
- $(OBJ_DIR)/flowsummary-last-run.js
+ $(OBJ_DIR)/flowstats.js \
+ $(OBJ_DIR)/flowstats-no-data.js
all: $(OBJ)
diff --git a/src/web/js/azkaban.flow.stats.view.js b/src/web/js/azkaban.flow.stats.view.js
index 5f48edc..df850e1 100644
--- a/src/web/js/azkaban.flow.stats.view.js
+++ b/src/web/js/azkaban.flow.stats.view.js
@@ -134,17 +134,17 @@ azkaban.FlowStatsView = Backbone.View.extend({
var data = this.model.get('data');
if (data == null) {
var msg = { message: "Error retrieving flow stats."};
- dust.render("flowsummary-no-data", msg, function(err, out) {
+ dust.render("flowstats-no-data", msg, function(err, out) {
view.display(out);
});
}
else if (data.success == "false") {
- dust.render("flowsummary-no-data", data, function(err, out) {
+ dust.render("flowstats-no-data", data, function(err, out) {
view.display(out);
});
}
else {
- dust.render("flowsummary-last-run", data, function(err, out) {
+ dust.render("flowstats", data, function(err, out) {
view.display(out);
});
}
src/web/js/azkaban.flow.view.js 2(+1 -1)
diff --git a/src/web/js/azkaban.flow.view.js b/src/web/js/azkaban.flow.view.js
index 028a07b..1e8c0ef 100644
--- a/src/web/js/azkaban.flow.view.js
+++ b/src/web/js/azkaban.flow.view.js
@@ -347,7 +347,7 @@ azkaban.SummaryView = Backbone.View.extend({
var view = this;
var successHandler = function(data) {
if (data.success == "false" || data.execId == null) {
- dust.render("flowsummary-no-data", data, function(err, out) {
+ dust.render("flowstats-no-data", data, function(err, out) {
$('#flow-stats-container').html(out);
});
return;