diff --git a/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java b/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java index 265323f9b..5a762a14c 100644 --- a/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java +++ b/src/main/java/org/codelibs/fess/app/pager/DataConfigPager.java @@ -60,6 +60,8 @@ public class DataConfigPager implements Serializable { public String versionNo; + public String description; + public void clear() { allRecordCount = 0; allPageCount = 0; @@ -77,6 +79,7 @@ public class DataConfigPager implements Serializable { createdBy = null; createdTime = null; versionNo = null; + description = null; } diff --git a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java index 634059e22..30f63b9dd 100644 --- a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java +++ b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java @@ -20,6 +20,7 @@ import java.util.List; import javax.annotation.Resource; import org.codelibs.core.beans.util.BeanUtil; +import org.codelibs.core.lang.StringUtil; import org.codelibs.fess.Constants; import org.codelibs.fess.app.pager.DataConfigPager; import org.codelibs.fess.es.config.cbean.DataConfigCB; @@ -74,8 +75,14 @@ public class DataConfigService { } protected void setupListCondition(final DataConfigCB cb, final DataConfigPager dataConfigPager) { - if (dataConfigPager.id != null) { - cb.query().docMeta().setId_Equal(dataConfigPager.id); + if (StringUtil.isNotBlank(dataConfigPager.name)) { + cb.query().setName_Wildcard(dataConfigPager.name); + } + if (StringUtil.isNotBlank(dataConfigPager.handlerName)) { + cb.query().setHandlerName_Wildcard(dataConfigPager.handlerName); + } + if (StringUtil.isNotBlank(dataConfigPager.description)) { + cb.query().setDescription_Wildcard(dataConfigPager.description); } // TODO Long, Integer, String supported only. diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java index f0fe61f9e..499031438 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/AdminDataconfigAction.java @@ -112,9 +112,10 @@ public class AdminDataconfigAction extends FessAdminAction { protected void searchPaging(final RenderData data, final SearchForm form) { RenderDataUtil.register(data, "dataConfigItems", dataConfigService.getDataConfigList(dataConfigPager)); // page navi + registerHandlerNames(data); // restore from pager - copyBeanToBean(dataConfigPager, form, op -> op.include("id")); + copyBeanToBean(dataConfigPager, form, op -> op.include("name", "handlerName", "description")); } // =================================================================================== @@ -352,9 +353,10 @@ public class AdminDataconfigAction extends FessAdminAction { private HtmlResponse asListHtml() { return asHtml(path_AdminDataconfig_AdminDataconfigJsp).renderWith(data -> { RenderDataUtil.register(data, "dataConfigItems", dataConfigService.getDataConfigList(dataConfigPager)); + registerHandlerNames(data); }).useForm(SearchForm.class, setup -> { setup.setup(form -> { - copyBeanToBean(dataConfigPager, form, op -> op.include("id")); + copyBeanToBean(dataConfigPager, form, op -> op.include("name", "handlerName", "description")); }); }); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/SearchForm.java index 19bb64f3e..26fb3b8f2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dataconfig/SearchForm.java @@ -21,5 +21,10 @@ package org.codelibs.fess.app.web.admin.dataconfig; */ public class SearchForm { - public String id; + public String name; + + public String handlerName; + + public String description; + } diff --git a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java index bbbd32acb..332ca76e5 100644 --- a/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java +++ b/src/main/java/org/codelibs/fess/app/web/api/admin/dataconfig/SearchBody.java @@ -18,6 +18,11 @@ package org.codelibs.fess.app.web.api.admin.dataconfig; import org.codelibs.fess.app.web.api.admin.BaseSearchBody; public class SearchBody extends BaseSearchBody { - public String id; + + public String name; + + public String handlerName; + + public String description; } diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp index 60edfc869..a569875a8 100644 --- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp +++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp @@ -36,6 +36,52 @@ + + + + + + + + + + + + + + + ${f:h(hn.label)} + + + + + + + + + + + + + "> + + + + "> + + + + + <%-- List --%>