diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/PropertyValidator.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/PropertyValidator.java index a13bcfc74c8a691a777e5117959fe05caa9106bf..6209165db875020446faf282d271911610979cfc 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/PropertyValidator.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/util/PropertyValidator.java @@ -59,9 +59,11 @@ public final class PropertyValidator implements IPropertyValueValidator SECONDS_DATE_PATTERN("yyyy-MM-dd HH:mm:ss"), US_DATE_PATTERN("M/d/yy"), - + US_DATE_TIME_PATTERN("M/d/yy h:mm a"), + US_DATE_TIME_24_PATTERN("M/d/yy HH:mm"), + CANONICAL_DATE_PATTERN(BasicConstant.CANONICAL_DATE_FORMAT_PATTERN), RENDERED_CANONICAL_DATE_PATTERN(BasicConstant.RENDERED_CANONICAL_DATE_FORMAT_PATTERN); diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java index 16aa398b54cfd19701660bbc7fd36a60519d370d..cffed695abb4a798ee3e030f1f17cd41b74ce8b9 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/PropertyValidatorTest.java @@ -121,6 +121,10 @@ public final class PropertyValidatorTest extends AbstractBOTest createTimestampPropertyType(), DateFormatUtils.format(new Date(), SupportedDatePattern.CANONICAL_DATE_PATTERN.getPattern()) }, + { + createTimestampPropertyType(), + DateFormatUtils.format(new Date(), + SupportedDatePattern.US_DATE_TIME_24_PATTERN.getPattern()) }, { createIntegerPropertyType(), "1" }, { createRealPropertyType(), "1" }, { createRealPropertyType(), "1.1" },