|
@@ -168,7 +168,7 @@ public class AdminSchedulerAction extends FessAdminAction {
|
|
if (form.crudMode.intValue() == CrudMode.EDIT) {
|
|
if (form.crudMode.intValue() == CrudMode.EDIT) {
|
|
// back
|
|
// back
|
|
form.crudMode = CrudMode.DETAILS;
|
|
form.crudMode = CrudMode.DETAILS;
|
|
- return asDetailsHtml();
|
|
|
|
|
|
+ return asDetailsHtml(id);
|
|
} else {
|
|
} else {
|
|
form.crudMode = CrudMode.EDIT;
|
|
form.crudMode = CrudMode.EDIT;
|
|
return asEditHtml();
|
|
return asEditHtml();
|
|
@@ -182,7 +182,9 @@ public class AdminSchedulerAction extends FessAdminAction {
|
|
public HtmlResponse details(final int crudMode, final String id) {
|
|
public HtmlResponse details(final int crudMode, final String id) {
|
|
verifyCrudMode(crudMode, CrudMode.DETAILS);
|
|
verifyCrudMode(crudMode, CrudMode.DETAILS);
|
|
saveToken();
|
|
saveToken();
|
|
- return asHtml(path_AdminScheduler_AdminSchedulerDetailsJsp).useForm(EditForm.class, op -> {
|
|
|
|
|
|
+ return asHtml(path_AdminScheduler_AdminSchedulerDetailsJsp).renderWith(data -> {
|
|
|
|
+ data.register("systemJobId", fessConfig.isSystemJobId(id));
|
|
|
|
+ }).useForm(EditForm.class, op -> {
|
|
op.setup(form -> {
|
|
op.setup(form -> {
|
|
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
|
|
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
|
|
loadScheduledJob(form, entity);
|
|
loadScheduledJob(form, entity);
|
|
@@ -231,14 +233,14 @@ public class AdminSchedulerAction extends FessAdminAction {
|
|
@Execute
|
|
@Execute
|
|
public HtmlResponse delete(final EditForm form) {
|
|
public HtmlResponse delete(final EditForm form) {
|
|
verifyCrudMode(form.crudMode, CrudMode.DETAILS);
|
|
verifyCrudMode(form.crudMode, CrudMode.DETAILS);
|
|
- validate(form, messages -> {}, () -> asDetailsHtml());
|
|
|
|
- verifyToken(() -> asDetailsHtml());
|
|
|
|
final String id = form.id;
|
|
final String id = form.id;
|
|
|
|
+ validate(form, messages -> {}, () -> asDetailsHtml(id));
|
|
|
|
+ verifyToken(() -> asDetailsHtml(id));
|
|
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
|
|
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
|
|
scheduledJobService.delete(entity);
|
|
scheduledJobService.delete(entity);
|
|
saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
|
|
saveInfo(messages -> messages.addSuccessCrudDeleteCrudTable(GLOBAL));
|
|
}).orElse(() -> {
|
|
}).orElse(() -> {
|
|
- throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml());
|
|
|
|
|
|
+ throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asDetailsHtml(id));
|
|
});
|
|
});
|
|
return redirect(getClass());
|
|
return redirect(getClass());
|
|
}
|
|
}
|
|
@@ -246,9 +248,9 @@ public class AdminSchedulerAction extends FessAdminAction {
|
|
@Execute
|
|
@Execute
|
|
public HtmlResponse start(final EditForm form) {
|
|
public HtmlResponse start(final EditForm form) {
|
|
verifyCrudMode(form.crudMode, CrudMode.DETAILS);
|
|
verifyCrudMode(form.crudMode, CrudMode.DETAILS);
|
|
- validate(form, messages -> {}, () -> asDetailsHtml());
|
|
|
|
- verifyToken(() -> asDetailsHtml());
|
|
|
|
final String id = form.id;
|
|
final String id = form.id;
|
|
|
|
+ validate(form, messages -> {}, () -> asDetailsHtml(id));
|
|
|
|
+ verifyToken(() -> asDetailsHtml(id));
|
|
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
|
|
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
|
|
try {
|
|
try {
|
|
entity.start();
|
|
entity.start();
|
|
@@ -256,12 +258,12 @@ public class AdminSchedulerAction extends FessAdminAction {
|
|
} catch (final Exception e) {
|
|
} catch (final Exception e) {
|
|
throwValidationError(messages -> {
|
|
throwValidationError(messages -> {
|
|
messages.addErrorsFailedToStartJob(GLOBAL, entity.getName());
|
|
messages.addErrorsFailedToStartJob(GLOBAL, entity.getName());
|
|
- }, () -> asDetailsHtml());
|
|
|
|
|
|
+ }, () -> asDetailsHtml(id));
|
|
}
|
|
}
|
|
}).orElse(() -> {
|
|
}).orElse(() -> {
|
|
throwValidationError(messages -> {
|
|
throwValidationError(messages -> {
|
|
messages.addErrorsFailedToStartJob(GLOBAL, id);
|
|
messages.addErrorsFailedToStartJob(GLOBAL, id);
|
|
- }, () -> asDetailsHtml());
|
|
|
|
|
|
+ }, () -> asDetailsHtml(id));
|
|
});
|
|
});
|
|
return redirect(getClass());
|
|
return redirect(getClass());
|
|
}
|
|
}
|
|
@@ -269,9 +271,9 @@ public class AdminSchedulerAction extends FessAdminAction {
|
|
@Execute
|
|
@Execute
|
|
public HtmlResponse stop(final EditForm form) {
|
|
public HtmlResponse stop(final EditForm form) {
|
|
verifyCrudMode(form.crudMode, CrudMode.DETAILS);
|
|
verifyCrudMode(form.crudMode, CrudMode.DETAILS);
|
|
- validate(form, messages -> {}, () -> asDetailsHtml());
|
|
|
|
- verifyToken(() -> asDetailsHtml());
|
|
|
|
final String id = form.id;
|
|
final String id = form.id;
|
|
|
|
+ validate(form, messages -> {}, () -> asDetailsHtml(id));
|
|
|
|
+ verifyToken(() -> asDetailsHtml(id));
|
|
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
|
|
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
|
|
try {
|
|
try {
|
|
final JobExecutor jobExecutoer = jobHelper.getJobExecutoer(entity.getId());
|
|
final JobExecutor jobExecutoer = jobHelper.getJobExecutoer(entity.getId());
|
|
@@ -280,12 +282,12 @@ public class AdminSchedulerAction extends FessAdminAction {
|
|
} catch (final Exception e) {
|
|
} catch (final Exception e) {
|
|
throwValidationError(messages -> {
|
|
throwValidationError(messages -> {
|
|
messages.addErrorsFailedToStopJob(GLOBAL, entity.getName());
|
|
messages.addErrorsFailedToStopJob(GLOBAL, entity.getName());
|
|
- }, () -> asDetailsHtml());
|
|
|
|
|
|
+ }, () -> asDetailsHtml(id));
|
|
}
|
|
}
|
|
}).orElse(() -> {
|
|
}).orElse(() -> {
|
|
throwValidationError(messages -> {
|
|
throwValidationError(messages -> {
|
|
messages.addErrorsFailedToStartJob(GLOBAL, id);
|
|
messages.addErrorsFailedToStartJob(GLOBAL, id);
|
|
- }, () -> asDetailsHtml());
|
|
|
|
|
|
+ }, () -> asDetailsHtml(id));
|
|
});
|
|
});
|
|
return redirect(getClass());
|
|
return redirect(getClass());
|
|
}
|
|
}
|
|
@@ -365,7 +367,9 @@ public class AdminSchedulerAction extends FessAdminAction {
|
|
return asHtml(path_AdminScheduler_AdminSchedulerEditJsp);
|
|
return asHtml(path_AdminScheduler_AdminSchedulerEditJsp);
|
|
}
|
|
}
|
|
|
|
|
|
- private HtmlResponse asDetailsHtml() {
|
|
|
|
- return asHtml(path_AdminScheduler_AdminSchedulerDetailsJsp);
|
|
|
|
|
|
+ private HtmlResponse asDetailsHtml(String id) {
|
|
|
|
+ return asHtml(path_AdminScheduler_AdminSchedulerDetailsJsp).renderWith(data -> {
|
|
|
|
+ data.register("systemJobId", fessConfig.isSystemJobId(id));
|
|
|
|
+ });
|
|
}
|
|
}
|
|
}
|
|
}
|