diff --git a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java index 0a22ed5c9..7367997db 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/crawlinginfo/AdminCrawlinginfoAction.java @@ -59,16 +59,9 @@ public class AdminCrawlinginfoAction extends FessAdminAction { // =================================================================================== // Search Execute // ============== - @Execute - public HtmlResponse deleteall(final EditForm form) { - validate(form, messages -> {}, () -> asListHtml()); - crawlingSessionService.deleteOldSessions(jobHelper.getRunningSessionIdSet()); - saveInfo(messages -> messages.addSuccessCrawlingSessionDeleteAll(GLOBAL)); - return redirect(getClass()); - } - @Execute public HtmlResponse index() { + saveToken(); return asListHtml(); } @@ -153,6 +146,15 @@ public class AdminCrawlinginfoAction extends FessAdminAction { return redirect(getClass()); } + @Execute + public HtmlResponse deleteall() { + verifyToken(() -> asListHtml()); + // FIXME: + crawlingSessionService.deleteOldSessions(jobHelper.getRunningSessionIdSet()); + saveInfo(messages -> messages.addSuccessCrawlingSessionDeleteAll(GLOBAL)); + return redirect(getClass()); + } + // =================================================================================== // Assist Logic // ============ 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 6aba455bd..0ce8bdfe9 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 @@ -58,6 +58,7 @@ public class AdminFailureurlAction extends FessAdminAction { // ============== @Execute public HtmlResponse index() { + saveToken(); return asListHtml(); } @@ -137,11 +138,16 @@ public class AdminFailureurlAction extends FessAdminAction { } @Execute - public HtmlResponse deleteall(final EditForm form) { - validate(form, messages -> {}, () -> asListHtml()); + public HtmlResponse deleteall() { + verifyToken(() -> asListHtml()); failureUrlService.deleteAll(failureUrlPager); + failureUrlPager.clear(); saveInfo(messages -> messages.addSuccessFailureUrlDeleteAll(GLOBAL)); - return redirect(getClass()); + return asHtml(path_AdminFailureurl_AdminFailureurlJsp).useForm(SearchForm.class, setup -> { + setup.setup(form -> { + copyBeanToBean(failureUrlPager, form, op -> {}); + }); + }); } // =================================================================================== diff --git a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp index ab713eac4..f70547f9c 100644 --- a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp +++ b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp @@ -146,47 +146,52 @@