0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #598 add job status check

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-08-18 17:07:44 +09:00
parent e9debe6d82
commit fd2e05a3a6
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/org/codelibs/fess/app/web/admin/scheduler/AdminSchedulerAction.java
View file

@ -184,6 +184,7 @@ public class AdminSchedulerAction extends FessAdminAction {
form.crudMode = crudMode;
LaRequestUtil.getOptionalRequest().ifPresent(request -> {
request.setAttribute("running", entity.isRunning());
request.setAttribute("enabled", entity.isEnabled());
});
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), () -> asListHtml());
@ -266,6 +267,11 @@ public class AdminSchedulerAction extends FessAdminAction {
validate(form, messages -> {}, () -> asDetailsHtml(id));
verifyToken(() -> asDetailsHtml(id));
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
if(!entity.isEnabled()||entity.isRunning()){
throwValidationError(messages -> {
messages.addErrorsFailedToStartJob(GLOBAL, entity.getName());
}, () -> asDetailsHtml(id));
}
try {
entity.start();
saveInfo(messages -> messages.addSuccessJobStarted(GLOBAL, entity.getName()));

2
src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_details.jsp
View file

@ -163,7 +163,7 @@
<la:message key="labels.scheduledjob_button_stop" />
</button>
</c:if>
<c:if test="${!running}">
<c:if test="${!running && enabled}">
<button type="submit" class="btn btn-success" name="start"
value="<la:message key="labels.scheduledjob_button_start" />">
<i class="fa fa-play-circle"></i>