azkaban-aplcache
add "size" parameter during initializing a new page. (#1941) #1797 …
9/4/2018 3:20:11 PM
3.56.03.57.0
Changes
Details
diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
index 30b1a89..64f840b 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/servlet/AbstractAzkabanServlet.java
@@ -295,6 +295,8 @@ public abstract class AbstractAzkabanServlet extends HttpServlet {
page.add("utils", utils);
page.add("timezone", TimeZone.getDefault().getID());
page.add("currentTime", (new DateTime()).getMillis());
+ page.add("size", getDisplayExecutionPageSize());
+
if (session != null && session.getUser() != null) {
page.add("user_id", session.getUser().getUserId());
}
@@ -344,6 +346,7 @@ public abstract class AbstractAzkabanServlet extends HttpServlet {
page.add("timezone", TimeZone.getDefault().getID());
page.add("currentTime", (new DateTime()).getMillis());
page.add("context", req.getContextPath());
+ page.add("size", getDisplayExecutionPageSize());
// @TODO, allow more than one type of viewer. For time sake, I only install
// the first one
diff --git a/azkaban-web-server/src/web/js/azkaban/view/flow.js b/azkaban-web-server/src/web/js/azkaban/view/flow.js
index a703b1a..c9c1c81 100644
--- a/azkaban-web-server/src/web/js/azkaban/view/flow.js
+++ b/azkaban-web-server/src/web/js/azkaban/view/flow.js
@@ -114,7 +114,8 @@ azkaban.ExecutionsView = Backbone.View.extend({
initialize: function (settings) {
this.model.bind('change:view', this.handleChangeView, this);
this.model.bind('render', this.render, this);
- this.model.set({page: 1, pageSize: this.model.get("pageSize")});
+ console.log("during initialization, pageSize: " + pageSize);
+ this.model.set({page: 1, pageSize: pageSize});
this.model.bind('change:page', this.handlePageChange, this);
},