Skip to content

Commit

Permalink
NAS-2642: Pagesize will now no longer change to default when another …
Browse files Browse the repository at this point in the history
…page is selected
  • Loading branch information
Knud Åge Hansen committed Oct 5, 2017
1 parent 6d2d252 commit f4a9fb8
Showing 1 changed file with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ public void crawllog_list(HttpServletRequest req, HttpServletResponse resp, List
TemplateBuilderFactory<MasterTemplateBuilder> tplBuilder = TemplateBuilderFactory.getInstance(environment.templateMaster, "master.tpl", "UTF-8", MasterTemplateBuilder.class);
MasterTemplateBuilder masterTplBuilder = tplBuilder.getTemplateBuilder();

long linesPerPage = 1000;
long linesPerPage = 100;
long page = getPage(req);
linesPerPage = getLinesPerPage(req, linesPerPage);

Expand Down Expand Up @@ -664,8 +664,9 @@ public void frontier_list(HttpServletRequest req, HttpServletResponse resp, List
StringBuilder sb = new StringBuilder();
StringBuilder menuSb = new StringBuilder();

long linesPerPage = 100;
long page = getPage(req);
long linesPerPage = getLinesPerPage(req);
linesPerPage = getLinesPerPage(req, linesPerPage);
String regex = getParameterRegex(req);
String initials = getInitials(req);
String pageString = String.valueOf(page);
Expand Down Expand Up @@ -891,7 +892,7 @@ private String getInitials(HttpServletRequest req) {
}

private long getLinesPerPage(HttpServletRequest req) {
long limit = 1000;
long limit = 100;
String limitStr = req.getParameter("limit");
if (limitStr != null && limitStr.length() > 0) {
try {
Expand Down

0 comments on commit f4a9fb8

Please sign in to comment.