Explorar o código

add validation in design action

Keiichi Watanabe %!s(int64=9) %!d(string=hai) anos
pai
achega
f564599168

+ 2 - 2
src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java

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