diff --git a/src/main/java/org/codelibs/fess/app/web/RootAction.java b/src/main/java/org/codelibs/fess/app/web/RootAction.java index 56c765557..67d738f75 100644 --- a/src/main/java/org/codelibs/fess/app/web/RootAction.java +++ b/src/main/java/org/codelibs/fess/app/web/RootAction.java @@ -38,8 +38,7 @@ public class RootAction extends FessSearchAction { searchAvailable(); return asHtml(path_IndexJsp).renderWith(data -> { - buildLabelParams(data, form.fields); - buildUserParams(data); + buildLabelParams(form.fields); buildInitParams(); }); } diff --git a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java index 2b98305bd..8a0095619 100644 --- a/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java @@ -107,6 +107,25 @@ public abstract class FessSearchAction extends FessBaseAction { super.setupHtmlData(runtime); runtime.registerData("osddLink", openSearchHelper.hasOpenSearchFile()); runtime.registerData("helpPage", viewHelper.getPagePath("common/help")); + + List> labelTypeItems = labelTypeHelper.getLabelTypeItemList(); + runtime.registerData("labelTypeItems", labelTypeItems); + runtime.registerData("displayLabelTypeItems", labelTypeItems != null && !labelTypeItems.isEmpty()); + + Locale locale = request.getLocale(); + if (locale == null) { + locale = Locale.ENGLISH; + } + runtime.registerData("langItems", systemHelper.getLanguageItems(locale)); + + final HttpSession session = request.getSession(false); + if (session != null) { + final Object obj = session.getAttribute(SSCConstants.USER_INFO); + if (obj instanceof LoginInfo) { + final LoginInfo loginInfo = (LoginInfo) obj; + runtime.registerData("username", loginInfo.getUsername()); + } + } } protected void searchAvailable() { @@ -117,11 +136,9 @@ public abstract class FessSearchAction extends FessBaseAction { } } - protected List> buildLabelParams(RenderData data, SearchParamMap fields) { + protected void buildLabelParams(SearchParamMap fields) { // label List> labelTypeItems = labelTypeHelper.getLabelTypeItemList(); - data.register("labelTypeItems", labelTypeItems); - data.register("displayLabelTypeItems", labelTypeItems != null && !labelTypeItems.isEmpty()); if (!labelTypeItems.isEmpty() && !fields.containsKey(FessSearchAction.LABEL_FIELD)) { final String defaultLabelValue = crawlerProperties.getProperty(Constants.DEFAULT_LABEL_VALUE_PROPERTY, StringUtil.EMPTY); @@ -148,27 +165,6 @@ public abstract class FessSearchAction extends FessBaseAction { } } request.setAttribute(Constants.LABEL_VALUE_MAP, labelMap); - - return labelTypeItems; - } - - protected void buildUserParams(RenderData data) { - - Locale locale = request.getLocale(); - if (locale == null) { - locale = Locale.ENGLISH; - } - data.register("langItems", systemHelper.getLanguageItems(locale)); - - final HttpSession session = request.getSession(false); - if (session != null) { - final Object obj = session.getAttribute(SSCConstants.USER_INFO); - if (obj instanceof LoginInfo) { - final LoginInfo loginInfo = (LoginInfo) obj; - data.register("username", loginInfo.getUsername()); - } - } - } protected void buildInitParams() { diff --git a/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java b/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java index 5172087fa..49e184e6b 100644 --- a/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java +++ b/src/main/java/org/codelibs/fess/app/web/help/HelpAction.java @@ -41,8 +41,7 @@ public class HelpAction extends FessSearchAction { @Execute public HtmlResponse help(HelpForm form) { return asHtml(path_HelpJsp).renderWith(data -> { - buildLabelParams(data, form.fields); - buildUserParams(data); + buildLabelParams(form.fields); buildInitParams(); }); } diff --git a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java index 668db96a5..322fd6a8d 100644 --- a/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java +++ b/src/main/java/org/codelibs/fess/app/web/search/SearchAction.java @@ -144,10 +144,9 @@ public class SearchAction extends FessSearchAction { return asHtml(path_SearchJsp).renderWith(data -> { updateSearchParams(form); - List> labelTypeItems = buildLabelParams(data, form.fields); - buildUserParams(data); + buildLabelParams(form.fields); doSearchInternal(data, form); - data.register("displayQuery", getDisplayQuery(form, labelTypeItems)); + data.register("displayQuery", getDisplayQuery(form, labelTypeHelper.getLabelTypeItemList())); data.register("pagingQuery", getPagingQuery(form)); }); } diff --git a/src/main/webapp/WEB-INF/view/error/header.jsp b/src/main/webapp/WEB-INF/view/error/header.jsp index 4c4eda44d..9a0b0ccb0 100755 --- a/src/main/webapp/WEB-INF/view/error/header.jsp +++ b/src/main/webapp/WEB-INF/view/error/header.jsp @@ -1,14 +1,14 @@ <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%> - +
- +