diff --git a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java index a926d3d95..f57989f7a 100644 --- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java +++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java @@ -30,6 +30,7 @@ import org.codelibs.fess.es.cbean.BoostDocumentRuleCB; import org.codelibs.fess.es.exbhv.BoostDocumentRuleBhv; import org.codelibs.fess.es.exentity.BoostDocumentRule; import org.dbflute.cbean.result.PagingResultBean; +import org.dbflute.optional.OptionalEntity; public class BoostDocumentRuleService implements Serializable { @@ -59,17 +60,8 @@ public class BoostDocumentRuleService implements Serializable { return boostDocumentRuleList; } - public BoostDocumentRule getBoostDocumentRule(final Map keys) { - final BoostDocumentRule boostDocumentRule = boostDocumentRuleBhv.selectEntity(cb -> { - cb.query().docMeta().setId_Equal(keys.get("id")); - setupEntityCondition(cb, keys); - }).orElse(null);//TODO - if (boostDocumentRule == null) { - // TODO exception? - return null; - } - - return boostDocumentRule; + public OptionalEntity getBoostDocumentRule(final String id) { + return boostDocumentRuleBhv.selectByPK(id); } public void store(final BoostDocumentRule boostDocumentRule) throws CrudMessageException { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java index b4947a0b4..9ae8ee3a2 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/AdminBoostdocumentruleAction.java @@ -16,9 +16,6 @@ package org.codelibs.fess.app.web.admin.boostdocumentrule; -import java.util.HashMap; -import java.util.Map; - import javax.annotation.Resource; import org.codelibs.fess.annotation.Token; @@ -28,6 +25,7 @@ import org.codelibs.fess.app.web.base.FessAdminAction; import org.codelibs.fess.crud.CommonConstants; import org.codelibs.fess.es.exentity.BoostDocumentRule; import org.codelibs.fess.helper.SystemHelper; +import org.dbflute.optional.OptionalEntity; import org.lastaflute.web.Execute; import org.lastaflute.web.callback.ActionRuntime; import org.lastaflute.web.response.HtmlResponse; @@ -62,14 +60,14 @@ public class AdminBoostdocumentruleAction extends FessAdminAction { // Search Execute // ============== @Execute - public HtmlResponse index(final BoostDocumentRuleSearchForm form) { + public HtmlResponse index(final SearchForm form) { return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } @Execute - public HtmlResponse list(final Integer pageNumber, final BoostDocumentRuleSearchForm form) { + public HtmlResponse list(final Integer pageNumber, final SearchForm form) { boostDocumentRulePager.setCurrentPageNumber(pageNumber); return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> { searchPaging(data, form); @@ -77,15 +75,15 @@ public class AdminBoostdocumentruleAction extends FessAdminAction { } @Execute - public HtmlResponse search(final BoostDocumentRuleSearchForm form) { - copyBeanToBean(form.searchParams, boostDocumentRulePager, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE)); + public HtmlResponse search(final SearchForm form) { + copyBeanToBean(form, boostDocumentRulePager, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE)); return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } @Execute - public HtmlResponse reset(final BoostDocumentRuleSearchForm form) { + public HtmlResponse reset(final SearchForm form) { boostDocumentRulePager.clear(); return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> { searchPaging(data, form); @@ -93,17 +91,17 @@ public class AdminBoostdocumentruleAction extends FessAdminAction { } @Execute - public HtmlResponse back(final BoostDocumentRuleSearchForm form) { + public HtmlResponse back(final SearchForm form) { return asHtml(path_AdminBoostdocumentrule_IndexJsp).renderWith(data -> { searchPaging(data, form); }); } - protected void searchPaging(final RenderData data, final BoostDocumentRuleSearchForm form) { + protected void searchPaging(final RenderData data, final SearchForm form) { data.register("boostDocumentRuleItems", boostDocumentRuleService.getBoostDocumentRuleList(boostDocumentRulePager)); // page navi // restore from pager - copyBeanToBean(boostDocumentRulePager, form.searchParams, op -> op.exclude(CommonConstants.PAGER_CONVERSION_RULE)); + copyBeanToBean(boostDocumentRulePager, form, op -> op.include("id")); } // =================================================================================== @@ -114,51 +112,92 @@ public class AdminBoostdocumentruleAction extends FessAdminAction { // ---------- @Token(save = true, validate = false) @Execute - public HtmlResponse createpage(final BoostDocumentRuleEditForm form) { - form.initialize(); - form.crudMode = CommonConstants.CREATE_MODE; + public HtmlResponse createpage() { + return asHtml(path_AdminBoostdocumentrule_EditJsp).useForm(CreateForm.class, op -> { + op.setup(form -> { + form.initialize(); + form.crudMode = CommonConstants.CREATE_MODE; + }); + }); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse editpage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CommonConstants.EDIT_MODE); + return asHtml(path_AdminBoostdocumentrule_EditJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + form.crudMode = crudMode; + }); + }); + } + + @Token(save = true, validate = false) + @Execute + public HtmlResponse createagain(final CreateForm form) { + verifyCrudMode(form.crudMode, CommonConstants.CREATE_MODE); + validate(form, messages -> {}, toEditHtml()); return asHtml(path_AdminBoostdocumentrule_EditJsp); } @Token(save = true, validate = false) @Execute - public HtmlResponse editpage(final int crudMode, final String id, final BoostDocumentRuleEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CommonConstants.EDIT_MODE); - loadBoostDocumentRule(form); + public HtmlResponse editagain(final EditForm form) { + verifyCrudMode(form.crudMode, CommonConstants.EDIT_MODE); + validate(form, messages -> {}, toEditHtml()); return asHtml(path_AdminBoostdocumentrule_EditJsp); } @Token(save = true, validate = false) @Execute - public HtmlResponse editagain(final BoostDocumentRuleEditForm form) { - return asHtml(path_AdminBoostdocumentrule_EditJsp); - } - - @Token(save = true, validate = false) - @Execute - public HtmlResponse editfromconfirm(final BoostDocumentRuleEditForm form) { + public HtmlResponse editfromconfirm(final EditForm form) { + validate(form, messages -> {}, toEditHtml()); form.crudMode = CommonConstants.EDIT_MODE; - loadBoostDocumentRule(form); + String id = form.id; + boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> { + copyBeanToBean(entity, form, op -> {}); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return asHtml(path_AdminBoostdocumentrule_EditJsp); } @Token(save = true, validate = false) @Execute - public HtmlResponse deletepage(final int crudMode, final String id, final BoostDocumentRuleEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CommonConstants.DELETE_MODE); - loadBoostDocumentRule(form); - return asHtml(path_AdminBoostdocumentrule_ConfirmJsp); + public HtmlResponse deletepage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CommonConstants.DELETE_MODE); + return asHtml(path_AdminBoostdocumentrule_ConfirmJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + form.crudMode = crudMode; + }); + }); } @Token(save = true, validate = false) @Execute - public HtmlResponse deletefromconfirm(final BoostDocumentRuleEditForm form) { + public HtmlResponse deletefromconfirm(final EditForm form) { + validate(form, messages -> {}, toEditHtml()); form.crudMode = CommonConstants.DELETE_MODE; - loadBoostDocumentRule(form); + String id = form.id; + boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> { + copyBeanToBean(entity, form, op -> {}); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return asHtml(path_AdminBoostdocumentrule_ConfirmJsp); } @@ -166,25 +205,35 @@ public class AdminBoostdocumentruleAction extends FessAdminAction { // Confirm // ------- @Execute - public HtmlResponse confirmpage(final int crudMode, final String id, final BoostDocumentRuleEditForm form) { - form.crudMode = crudMode; - form.id = id; - verifyCrudMode(form, CommonConstants.CONFIRM_MODE); - loadBoostDocumentRule(form); + public HtmlResponse confirmpage(final int crudMode, final String id) { + verifyCrudMode(crudMode, CommonConstants.CONFIRM_MODE); + return asHtml(path_AdminBoostdocumentrule_ConfirmJsp).useForm(EditForm.class, op -> { + op.setup(form -> { + boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> { + copyBeanToBean(entity, form, copyOp -> { + copyOp.excludeNull(); + }); + form.crudMode = crudMode; + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); + }); + }); + } + + @Token(save = false, validate = true, keep = true) + @Execute + public HtmlResponse confirmfromcreate(final CreateForm form) { + validate(form, messages -> {}, toEditHtml()); + form.crudMode = CommonConstants.CREATE_MODE; return asHtml(path_AdminBoostdocumentrule_ConfirmJsp); } @Token(save = false, validate = true, keep = true) @Execute - public HtmlResponse confirmfromcreate(final BoostDocumentRuleEditForm form) { - validate(form, messages -> {}, toEditHtml()); - return asHtml(path_AdminBoostdocumentrule_ConfirmJsp); - } - - @Token(save = false, validate = true, keep = true) - @Execute - public HtmlResponse confirmfromupdate(final BoostDocumentRuleEditForm form) { + public HtmlResponse confirmfromupdate(final EditForm form) { validate(form, messages -> {}, toEditHtml()); + form.crudMode = CommonConstants.EDIT_MODE; return asHtml(path_AdminBoostdocumentrule_ConfirmJsp); } @@ -193,75 +242,88 @@ public class AdminBoostdocumentruleAction extends FessAdminAction { // ------------- @Token(save = false, validate = true) @Execute - public HtmlResponse create(final BoostDocumentRuleEditForm form) { + public HtmlResponse create(final CreateForm form) { + verifyCrudMode(form.crudMode, CommonConstants.CREATE_MODE); validate(form, messages -> {}, toEditHtml()); - boostDocumentRuleService.store(createBoostDocumentRule(form)); - saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + createBoostDocumentRule(form).ifPresent(entity -> { + copyBeanToBean(form, entity, op -> op.exclude(CommonConstants.COMMON_CONVERSION_RULE)); + boostDocumentRuleService.store(entity); + saveInfo(messages -> messages.addSuccessCrudCreateCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudFailedToCreateCrudTable(GLOBAL), toEditHtml()); + }); return redirect(getClass()); } @Token(save = false, validate = true) @Execute - public HtmlResponse update(final BoostDocumentRuleEditForm form) { + public HtmlResponse update(final EditForm form) { + verifyCrudMode(form.crudMode, CommonConstants.EDIT_MODE); validate(form, messages -> {}, toEditHtml()); - boostDocumentRuleService.store(createBoostDocumentRule(form)); - saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + createBoostDocumentRule(form).ifPresent(entity -> { + copyBeanToBean(form, entity, op -> op.exclude(CommonConstants.COMMON_CONVERSION_RULE)); + boostDocumentRuleService.store(entity); + saveInfo(messages -> messages.addSuccessCrudUpdateCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); + }); return redirect(getClass()); } @Execute - public HtmlResponse delete(final BoostDocumentRuleEditForm form) { - verifyCrudMode(form, CommonConstants.DELETE_MODE); - boostDocumentRuleService.delete(getBoostDocumentRule(form)); - saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + public HtmlResponse delete(final EditForm form) { + verifyCrudMode(form.crudMode, CommonConstants.DELETE_MODE); + validate(form, messages -> {}, toEditHtml()); + String id = form.id; + boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> { + boostDocumentRuleService.delete(entity); + saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL)); + }).orElse(() -> { + throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml()); + }); return redirect(getClass()); } // =================================================================================== // Assist Logic // ============ - protected void loadBoostDocumentRule(final BoostDocumentRuleEditForm form) { - copyBeanToBean(getBoostDocumentRule(form), form, op -> op.exclude("crudMode")); - } - protected BoostDocumentRule getBoostDocumentRule(final BoostDocumentRuleEditForm form) { - final BoostDocumentRule boostDocumentRule = boostDocumentRuleService.getBoostDocumentRule(createKeyMap(form)); - if (boostDocumentRule == null) { - throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, form.id), toEditHtml()); - } - return boostDocumentRule; - } - - protected BoostDocumentRule createBoostDocumentRule(final BoostDocumentRuleEditForm form) { - BoostDocumentRule boostDocumentRule; + protected OptionalEntity createBoostDocumentRule(final CreateForm form) { final String username = systemHelper.getUsername(); final long currentTime = systemHelper.getCurrentTimeAsLong(); - if (form.crudMode == CommonConstants.EDIT_MODE) { - boostDocumentRule = getBoostDocumentRule(form); - } else { - boostDocumentRule = new BoostDocumentRule(); - boostDocumentRule.setCreatedBy(username); - boostDocumentRule.setCreatedTime(currentTime); + switch (form.crudMode) { + case CommonConstants.CREATE_MODE: + if (form instanceof CreateForm) { + BoostDocumentRule entity = new BoostDocumentRule(); + entity.setCreatedBy(username); + entity.setCreatedTime(currentTime); + entity.setUpdatedBy(username); + entity.setUpdatedTime(currentTime); + return OptionalEntity.of(entity); + } + break; + case CommonConstants.EDIT_MODE: + if (form instanceof EditForm) { + return boostDocumentRuleService.getBoostDocumentRule(((EditForm) form).id).map(entity -> { + entity.setUpdatedBy(username); + entity.setUpdatedTime(currentTime); + return entity; + }); + } + break; + default: + break; } - boostDocumentRule.setUpdatedBy(username); - boostDocumentRule.setUpdatedTime(currentTime); - copyBeanToBean(form, boostDocumentRule, op -> op.exclude(CommonConstants.COMMON_CONVERSION_RULE)); - return boostDocumentRule; - } - - protected Map createKeyMap(final BoostDocumentRuleEditForm form) { - final Map keys = new HashMap(); - keys.put("id", form.id); - return keys; + return OptionalEntity.empty(); } // =================================================================================== // Small Helper // ============ - protected void verifyCrudMode(final BoostDocumentRuleEditForm form, final int expectedMode) { - if (form.crudMode != expectedMode) { + protected void verifyCrudMode(final int crudMode, final int expectedMode) { + if (crudMode != expectedMode) { throwValidationError(messages -> { - messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(form.crudMode)); + messages.addErrorsCrudInvalidMode(GLOBAL, String.valueOf(expectedMode), String.valueOf(crudMode)); }, toEditHtml()); } } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/BoostDocumentRuleEditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/BoostDocumentRuleEditForm.java deleted file mode 100644 index 8721cdc1c..000000000 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/BoostDocumentRuleEditForm.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2009-2015 the CodeLibs Project and the Others. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language - * governing permissions and limitations under the License. - */ - -package org.codelibs.fess.app.web.admin.boostdocumentrule; - -import java.io.Serializable; - -import org.codelibs.fess.util.ComponentUtil; - -/** - * @author codelibs - * @author jflute - */ -public class BoostDocumentRuleEditForm implements Serializable { - - private static final long serialVersionUID = 1L; - - //@IntegerType - public int crudMode; - - //@Required(target = "confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 1000) - public String id; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 4000) - public String urlExpr; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 4000) - public String boostExpr; - - //@Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") - //@IntegerType - //@IntRange(min = 0, max = 2147483647) - public String sortOrder; - - //@Required(target = "confirmfromupdate,update,delete") - //@Maxbytelength(maxbytelength = 255) - public String createdBy; - - //@Required(target = "confirmfromupdate,update,delete") - //@LongType - public String createdTime; - - //@Maxbytelength(maxbytelength = 255) - public String updatedBy; - - //@LongType - public String updatedTime; - - //@Required(target = "confirmfromupdate,update,delete") - //@IntegerType - public String versionNo; - - public void initialize() { - id = null; - urlExpr = null; - boostExpr = null; - sortOrder = null; - createdBy = "system"; - createdTime = Long.toString(ComponentUtil.getSystemHelper().getCurrentTimeAsLong()); - updatedBy = null; - updatedTime = null; - versionNo = null; - - sortOrder = "0"; - } -} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/CreateForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/CreateForm.java new file mode 100644 index 000000000..7f6454694 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/CreateForm.java @@ -0,0 +1,45 @@ +package org.codelibs.fess.app.web.admin.boostdocumentrule; + +import java.io.Serializable; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.Size; + +import org.codelibs.fess.crud.CommonConstants; +import org.codelibs.fess.util.ComponentUtil; +import org.lastaflute.web.validation.Required; + +public class CreateForm implements Serializable { + + private static final long serialVersionUID = 1L; + + public Integer crudMode; + + @Required + @Size(max = 10000) + public String urlExpr; + + @Required + @Size(max = 10000) + public String boostExpr; + + @Required + @Min(value = 0) + @Max(value = 2147483647) + public Integer sortOrder; + + @Required + @Size(max = 1000) + public String createdBy; + + @Required + public Long createdTime; + + public void initialize() { + crudMode = CommonConstants.CREATE_MODE; + sortOrder = 0; + createdBy = ComponentUtil.getSystemHelper().getUsername(); + createdTime = ComponentUtil.getSystemHelper().getCurrentTimeAsLong(); + } +} \ No newline at end of file diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/EditForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/EditForm.java new file mode 100644 index 000000000..a6bf46cb2 --- /dev/null +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/EditForm.java @@ -0,0 +1,43 @@ +/* + * Copyright 2009-2015 the CodeLibs Project and the Others. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language + * governing permissions and limitations under the License. + */ + +package org.codelibs.fess.app.web.admin.boostdocumentrule; + +import javax.validation.constraints.Size; + +import org.lastaflute.web.validation.Required; + +/** + * @author shinsuke + * @author jflute + */ +public class EditForm extends CreateForm { + + private static final long serialVersionUID = 1L; + + @Required + @Size(max = 1000) + public String id; + + @Size(max = 1000) + public String updatedBy; + + public Long updatedTime; + + @Required + public Integer versionNo; + +} diff --git a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/BoostDocumentRuleSearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/SearchForm.java similarity index 81% rename from src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/BoostDocumentRuleSearchForm.java rename to src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/SearchForm.java index a81c2a852..73b074f63 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/BoostDocumentRuleSearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/boostdocumentrule/SearchForm.java @@ -17,16 +17,15 @@ package org.codelibs.fess.app.web.admin.boostdocumentrule; import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; /** * @author codelibs * @author jflute */ -public class BoostDocumentRuleSearchForm implements Serializable { +public class SearchForm implements Serializable { private static final long serialVersionUID = 1L; - public Map searchParams = new HashMap(); + public String id; + } diff --git a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp index 8fc3930d6..1d1c65080 100644 --- a/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp +++ b/src/main/webapp/WEB-INF/view/admin/boostdocumentrule/confirm.jsp @@ -109,7 +109,7 @@ <%-- Box Footer --%>
- " /> + " /> " />