Skip to content
Snippets Groups Projects
Commit 56080ba5 authored by Shinsuke Sugaya's avatar Shinsuke Sugaya
Browse files

fix #1566 improve form.num in session

parent c2c54bbc
No related branches found
No related tags found
No related merge requests found
...@@ -25,6 +25,7 @@ import java.util.Set; ...@@ -25,6 +25,7 @@ import java.util.Set;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.commons.text.StringEscapeUtils; import org.apache.commons.text.StringEscapeUtils;
import org.codelibs.core.lang.StringUtil; import org.codelibs.core.lang.StringUtil;
...@@ -144,6 +145,14 @@ public abstract class FessSearchAction extends FessBaseAction { ...@@ -144,6 +145,14 @@ public abstract class FessSearchAction extends FessBaseAction {
protected void buildFormParams(final SearchForm form) { protected void buildFormParams(final SearchForm form) {
final HttpSession session = request.getSession(false);
if (session != null) {
final Object resultsPerPage = session.getAttribute(Constants.RESULTS_PER_PAGE);
if (resultsPerPage instanceof Integer) {
form.num = (Integer) resultsPerPage;
}
}
// label // label
final List<Map<String, String>> labelTypeItems = labelTypeHelper.getLabelTypeItemList(SearchRequestType.SEARCH); final List<Map<String, String>> labelTypeItems = labelTypeHelper.getLabelTypeItemList(SearchRequestType.SEARCH);
......
...@@ -104,7 +104,7 @@ public class SearchAction extends FessSearchAction { ...@@ -104,7 +104,7 @@ public class SearchAction extends FessSearchAction {
if (viewHelper.isUseSession()) { if (viewHelper.isUseSession()) {
LaRequestUtil.getOptionalRequest().ifPresent(request -> { LaRequestUtil.getOptionalRequest().ifPresent(request -> {
final HttpSession session = request.getSession(false); final HttpSession session = request.getSession(false);
if (session != null) { if (session != null && form.num != null) {
session.setAttribute(Constants.RESULTS_PER_PAGE, form.num); session.setAttribute(Constants.RESULTS_PER_PAGE, form.num);
} }
}); });
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<label for="contentNum"><la:message key="labels.index_num" /></label> <label for="contentNum"><la:message key="labels.index_num" /></label>
<la:select property="num" styleId="numSearchOption" <la:select property="num" styleId="numSearchOption"
styleClass="form-control"> styleClass="form-control">
<option value=""> <option value="10">
<la:message key="labels.search_result_select_num" /> <la:message key="labels.search_result_select_num" />
</option> </option>
<la:option value="10">10</la:option> <la:option value="10">10</la:option>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment