diff --git a/src/main/config/tablemeta.properties b/src/main/config/tablemeta.properties index 5119ea1d3..3e04225a8 100644 --- a/src/main/config/tablemeta.properties +++ b/src/main/config/tablemeta.properties @@ -1910,7 +1910,7 @@ roleType.name.doubleTypeParam= roleType.name.dateTypeParam= roleType.name.defaultValue= roleType.value.requiredParam= -roleType.value.additionalAnnotation=@Maxbytelength(maxbytelength = 20)@Mask(mask="^[a-zA-Z0-9_-]+$", msg = @Msg(key="errors.alphaDigitOnly")) +roleType.value.additionalAnnotation=@Maxbytelength(maxbytelength = 20)@Mask(mask="^[a-zA-Z0-9_-| ]+$", msg = @Msg(key="errors.alphaDigitSpaceOnly")) roleType.value.annotation= roleType.value.enableJavaType=true roleType.value.longTypeParam= diff --git a/src/main/java/jp/sf/fess/action/admin/RoleTypeAction.java b/src/main/java/jp/sf/fess/action/admin/RoleTypeAction.java index 53bd63837..b6d5c9a93 100644 --- a/src/main/java/jp/sf/fess/action/admin/RoleTypeAction.java +++ b/src/main/java/jp/sf/fess/action/admin/RoleTypeAction.java @@ -47,6 +47,22 @@ public class RoleTypeAction extends BsRoleTypeAction { return systemHelper.getHelpLink("roleType"); } + @Override + @Token(save = false, validate = true, keep = true) + @Execute(validator = true, input = "edit.jsp") + public String confirmfromcreate() { + roleTypeForm.value = roleTypeForm.value.trim(); + return "confirm.jsp"; + } + + @Override + @Token(save = false, validate = true, keep = true) + @Execute(validator = true, input = "edit.jsp") + public String confirmfromupdate() { + roleTypeForm.value = roleTypeForm.value.trim(); + return "confirm.jsp"; + } + @Override protected void loadRoleType() { @@ -82,6 +98,7 @@ public class RoleTypeAction extends BsRoleTypeAction { } roleType.setUpdatedBy(username); roleType.setUpdatedTime(timestamp); + roleTypeForm.value = roleTypeForm.value.trim(); FessBeans.copy(roleTypeForm, roleType).excludesCommonColumns() .execute(); diff --git a/src/main/java/jp/sf/fess/crud/form/admin/BsRoleTypeForm.java b/src/main/java/jp/sf/fess/crud/form/admin/BsRoleTypeForm.java index ff20753cd..097886197 100644 --- a/src/main/java/jp/sf/fess/crud/form/admin/BsRoleTypeForm.java +++ b/src/main/java/jp/sf/fess/crud/form/admin/BsRoleTypeForm.java @@ -53,7 +53,7 @@ public abstract class BsRoleTypeForm { @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete") @Maxbytelength(maxbytelength = 20) - @Mask(mask = "^[a-zA-Z0-9_-| ]+$", msg = @Msg(key = "errors.alphaDigitOnly")) + @Mask(mask = "^[a-zA-Z0-9_-| ]+$", msg = @Msg(key = "errors.alphaDigitSpaceOnly")) public String value; @Required(target = "confirmfromupdate,update,delete") diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 47c263b7e..23e87bc02 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -26,6 +26,7 @@ errors.url={0} is an invalid url (web address). errors.cronexpression={0} is a invalid format. errors.uritype={0} is a invalid uri. errors.alphaDigitOnly={0} must be alphabet or digit only. +errors.alphaDigitSpaceOnly={0} must be alphabet, digit, or space only. errors.token=Invalid request. errors.failed_to_update_crawler_params=Failed to update parameters. Please contact to a site administrator. diff --git a/src/main/resources/application_ja.properties b/src/main/resources/application_ja.properties index bb5749490..ae9dbcf18 100644 --- a/src/main/resources/application_ja.properties +++ b/src/main/resources/application_ja.properties @@ -26,6 +26,7 @@ errors.url={0}\u306fURL\u3068\u3057\u3066\u4e0d\u6b63\u3067\u3059\u3002 errors.cronexpression={0}\u306f\u6b63\u3057\u3044\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 errors.uritype={0}\u306f\u6b63\u3057\u3044 URI \u5f62\u5f0f\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 errors.alphaDigitOnly={0}\u306f\u82f1\u6570\u5b57\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093\u3002 +errors.alphaDigitSpaceOnly={0}\u306f\u82f1\u6570\u5b57\u307e\u305f\u306f\u7a7a\u767d\u3067\u306a\u3051\u308c\u3070\u3044\u3051\u307e\u305b\u3093\u3002 errors.token=\u4e0d\u6b63\u306a\u30ea\u30af\u30a8\u30b9\u30c8\u3067\u3059\u3002 errors.failed_to_update_crawler_params=\u30d1\u30e9\u30e1\u30fc\u30bf\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30b5\u30a4\u30c8\u7ba1\u7406\u8005\u306b\u9023\u7d61\u3057\u3066\u304f\u3060\u3055\u3044\u3002