diff --git a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java index 0360969b9..226ffaa68 100644 --- a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java +++ b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java @@ -135,7 +135,7 @@ public class ScheduledJobService implements Serializable { jobScheduler.register(scheduledJob); } - public List getCrawloerJobList() { + public List getCrawlerJobList() { return scheduledJobBhv.selectList(cb -> { cb.query().setCrawler_Equal(Constants.T); cb.query().addOrderBy_SortOrder_Asc(); diff --git a/src/main/java/org/codelibs/fess/app/web/admin/system/AdminSystemAction.java b/src/main/java/org/codelibs/fess/app/web/admin/system/AdminSystemAction.java index 7f07111bc..bf32c5da9 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/system/AdminSystemAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/system/AdminSystemAction.java @@ -70,8 +70,8 @@ public class AdminSystemAction extends FessAdminAction { // Index // ============== @Execute - public HtmlResponse index(final SystemForm form) { - return asHtml(path_AdminSystem_IndexJsp).renderWith(data -> { + public HtmlResponse index() { + return asHtml(path_AdminSystem_IndexJsp).useForm(SystemForm.class).renderWith(data -> { data.register("clusterName", fessEsClient.getClusterName()); data.register("clusterStatus", fessEsClient.getStatus()); data.register("crawlerRunning", isCrawlerRunning()); @@ -80,10 +80,10 @@ public class AdminSystemAction extends FessAdminAction { } @Token(save = false, validate = true) - // @Execute(validator = true, input = "index") + @Execute public HtmlResponse start(final SystemForm form) { if (!jobHelper.isCrawlProcessRunning()) { - final List scheduledJobList = scheduledJobService.getCrawloerJobList(); + final List scheduledJobList = scheduledJobService.getCrawlerJobList(); for (final ScheduledJob scheduledJob : scheduledJobList) { scheduledJob.start(); } @@ -97,7 +97,7 @@ public class AdminSystemAction extends FessAdminAction { } @Token(save = false, validate = true) - //@Execute(validator = true, input = "index") + @Execute public HtmlResponse stop(final SystemForm form) { if (jobHelper.isCrawlProcessRunning()) { if (StringUtil.isNotBlank(form.sessionId)) { diff --git a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java index 1e1983d49..3b32d6b47 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/wizard/AdminWizardAction.java @@ -280,7 +280,7 @@ public class AdminWizardAction extends FessAdminAction { @Execute public HtmlResponse startCrawling(final StartCrawlingForm form) { if (!jobHelper.isCrawlProcessRunning()) { - final List scheduledJobList = scheduledJobService.getCrawloerJobList(); + final List scheduledJobList = scheduledJobService.getCrawlerJobList(); for (final ScheduledJob scheduledJob : scheduledJobList) { new Thread(() -> new TriggeredJob().execute(scheduledJob)).start(); }