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

add validation in design action

Browse source
This commit is contained in:
Keiichi Watanabe 2015-11-16 21:53:51 +09:00
parent 2363ab6711
commit f564599168
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java
View file

@ -115,7 +115,6 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
@Execute
public HtmlResponse upload(final DesignForm form) {
validate(form, messages -> {}, toMainHtml());
final String uploadedFileName = form.designFile.getFileName();
String fileName = form.designFileName;
if (StringUtil.isBlank(fileName)) {
@ -166,6 +165,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
logger.error("Failed to write an image file: {}", fileName, e);
throwValidationError(messages -> messages.addErrorsFailedToWriteDesignImageFile(GLOBAL), toMainHtml());
}
validate(form, messages -> {}, toMainHtml());
return redirect(getClass());
}
@ -188,7 +188,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
if (file == null) {
throwValidationError(messages -> messages.addErrorsTargetFileDoesNotExist(GLOBAL, form.fileName), toMainHtml());
}
validate(form, messages -> {}, toMainHtml());
return asStream(file.getName()).stream(out -> {
try (FileInputStream fis = new FileInputStream(file)) {
out.write(fis);