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 06231de98..e76e7ff1d 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 @@ -195,7 +195,7 @@ public class AdminBoostdocumentruleAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; boostDocumentRuleService.getBoostDocumentRule(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java index 1fe7ae6ae..deec65d6b 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlingsession/AdminCrawlingsessionAction.java @@ -163,7 +163,7 @@ public class AdminCrawlingsessionAction extends FessAdminAction { // ------------- @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toIndexHtml()); final String id = form.id; crawlingSessionService.getCrawlingSession(id).alwaysPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java index 6d32890e0..92bda5676 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/kuromoji/AdminDictKuromojiAction.java @@ -290,7 +290,7 @@ public class AdminDictKuromojiAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); kuromojiService.getKuromojiItem(form.dictId, form.id).ifPresent(entity -> { kuromojiService.delete(form.dictId, entity); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java index 748448870..dbdbdb680 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/dict/synonym/AdminDictSynonymAction.java @@ -323,7 +323,7 @@ public class AdminDictSynonymAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); synonymService.getSynonymItem(form.dictId, form.id).ifPresent(entity -> { synonymService.delete(form.dictId, entity); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java index 00c2705db..351b81207 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/AdminFailureurlAction.java @@ -128,7 +128,7 @@ public class AdminFailureurlAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toIndexHtml()); String id = form.id; failureUrlService.getFailureUrl(id).alwaysPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/SearchForm.java b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/SearchForm.java index 997d194bd..8b4631458 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/failureurl/SearchForm.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/failureurl/SearchForm.java @@ -16,6 +16,8 @@ package org.codelibs.fess.app.web.admin.failureurl; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; /** * @author codelibs @@ -26,4 +28,6 @@ public class SearchForm implements Serializable { private static final long serialVersionUID = 1L; public String id; + + public Map searchParams = new HashMap(); } \ No newline at end of file diff --git a/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java b/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java index a6d3526e6..0669fc9b3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/fileauthentication/AdminFileauthenticationAction.java @@ -217,7 +217,7 @@ public class AdminFileauthenticationAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; fileAuthenticationService.getFileAuthentication(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java index 5c4b931a0..4bdf62755 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java @@ -200,7 +200,7 @@ public class AdminGroupAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; groupService.getGroup(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java index 0c7f06e19..122932f69 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/joblog/AdminJoblogAction.java @@ -164,7 +164,7 @@ public class AdminJoblogAction extends FessAdminAction { // ------------- @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toIndexHtml()); String id = form.id; jobLogService.getJobLog(id).alwaysPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java index 24215cc57..a5ce7056e 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/overlappinghost/AdminOverlappinghostAction.java @@ -196,7 +196,7 @@ public class AdminOverlappinghostAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; overlappingHostService.getOverlappingHost(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java b/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java index 071357df8..8e8754c6c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/pathmapping/AdminPathmappingAction.java @@ -197,7 +197,7 @@ public class AdminPathmappingAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; pathMappingService.getPathMapping(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java index 152845b76..c273e6a37 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/requestheader/AdminRequestheaderAction.java @@ -219,7 +219,7 @@ public class AdminRequestheaderAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; requestHeaderService.getRequestHeader(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java index 3e3e526ab..2ab88d7b1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java @@ -200,7 +200,7 @@ public class AdminRoleAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; roleService.getRole(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java index 1907ff940..41131059c 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/roletype/AdminRoletypeAction.java @@ -196,7 +196,7 @@ public class AdminRoletypeAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; roleTypeService.getRoleType(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java index f389baa28..415ac653f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java @@ -200,7 +200,7 @@ public class AdminScheduledjobAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; scheduledJobService.getScheduledJob(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java index 98a662e37..34754aeb1 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggestbadword/AdminSuggestbadwordAction.java @@ -245,7 +245,7 @@ public class AdminSuggestbadwordAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; suggestBadWordService.getSuggestBadWord(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java b/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java index 3ecd18f46..9d203b631 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/suggestelevateword/AdminSuggestelevatewordAction.java @@ -245,7 +245,7 @@ public class AdminSuggestelevatewordAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; suggestElevateWordService.getSuggestElevateWord(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java index 169b16f65..93868370a 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java @@ -230,7 +230,7 @@ public class AdminUserAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; userService.getUser(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java index 175c56308..2ec49d1f3 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webauthentication/AdminWebauthenticationAction.java @@ -218,7 +218,7 @@ public class AdminWebauthenticationAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; webAuthenticationService.getWebAuthentication(id).ifPresent(entity -> { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java index 70c7e61d9..243030952 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/webconfig/AdminWebconfigAction.java @@ -209,7 +209,7 @@ public class AdminWebconfigAction extends FessAdminAction { @Execute public HtmlResponse delete(final EditForm form) { - verifyCrudMode(form.crudMode, CrudMode.DELETE); + verifyCrudMode(form.crudMode, CrudMode.DETAILS); validate(form, messages -> {}, toEditHtml()); final String id = form.id; webConfigService.getWebConfig(id).ifPresent(entity -> {