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

fix exception when starting job

Browse source
This commit is contained in:
Shinsuke Sugaya 2015-11-02 23:53:26 +09:00
parent b9cd5fe4c8
commit 227db11ae2
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/org/codelibs/fess/app/web/admin/scheduledjob/AdminScheduledjobAction.java
View file

@ -32,6 +32,7 @@ import org.lastaflute.web.callback.ActionRuntime;
import org.lastaflute.web.response.HtmlResponse;
import org.lastaflute.web.response.render.RenderData;
import org.lastaflute.web.token.TxToken;
import org.lastaflute.web.util.LaRequestUtil;
import org.lastaflute.web.validation.VaErrorHook;
/**
@ -52,8 +53,6 @@ public class AdminScheduledjobAction extends FessAdminAction {
@Resource
protected JobHelper jobHelper;
private boolean running = false;
// ===================================================================================
// Hook
// ======
@ -208,12 +207,13 @@ public class AdminScheduledjobAction extends FessAdminAction {
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
loadScheduledJob(form, entity);
form.crudMode = crudMode;
LaRequestUtil.getOptionalRequest().ifPresent(request -> {
request.setAttribute("running", entity.isRunning());
});
}).orElse(() -> {
throwValidationError(messages -> messages.addErrorsCrudCouldNotFindCrudTable(GLOBAL, id), toEditHtml());
});
});
}).renderWith(data -> {
data.register("running", running);
});
}
@ -221,18 +221,14 @@ public class AdminScheduledjobAction extends FessAdminAction {
public HtmlResponse confirmfromcreate(final CreateForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.CREATE;
return asHtml(path_AdminScheduledjob_ConfirmJsp).renderWith(data -> {
data.register("running", running);
});
return asHtml(path_AdminScheduledjob_ConfirmJsp);
}
@Execute(token = TxToken.VALIDATE_KEEP)
public HtmlResponse confirmfromupdate(final EditForm form) {
validate(form, messages -> {}, toEditHtml());
form.crudMode = CrudMode.EDIT;
return asHtml(path_AdminScheduledjob_ConfirmJsp).renderWith(data -> {
data.register("running", running);
});
return asHtml(path_AdminScheduledjob_ConfirmJsp);
}
// -----------------------------------------------------
@ -282,6 +278,8 @@ public class AdminScheduledjobAction extends FessAdminAction {
@Execute
public HtmlResponse start(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.CONFIRM);
validate(form, messages -> {}, toEditHtml());
final String id = form.id;
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
try {
@ -293,14 +291,17 @@ public class AdminScheduledjobAction extends FessAdminAction {
}, toEditHtml());
}
}).orElse(() -> {
// TODO
});
throwValidationError(messages -> {
messages.addErrorsFailedToStartJob(GLOBAL, id);
}, toEditHtml());
});
return redirect(getClass());
}
@Execute
public HtmlResponse stop(final EditForm form) {
verifyCrudMode(form.crudMode, CrudMode.CONFIRM);
validate(form, messages -> {}, toEditHtml());
final String id = form.id;
scheduledJobService.getScheduledJob(id).ifPresent(entity -> {
try {
@ -313,8 +314,10 @@ public class AdminScheduledjobAction extends FessAdminAction {
}, toEditHtml());
}
}).orElse(() -> {
// TODO
});
throwValidationError(messages -> {
messages.addErrorsFailedToStartJob(GLOBAL, id);
}, toEditHtml());
});
return redirect(getClass());
}