diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java index 65f5f420e..ae87a397c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeIntervalValidationVTwo.java @@ -27,6 +27,7 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo { private String startFieldName; private String endFieldName; + private String templateName; private String startValueName; private String endValueName; @@ -43,6 +44,16 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo { endPrecisionName = endFieldName + "-precision"; } + public DateTimeIntervalValidationVTwo(String startFieldName, String endFieldName, String template){ + this.templateName = template; + this.startFieldName = startFieldName; + this.endFieldName = endFieldName; + startValueName = startFieldName + "-value"; + endValueName = endFieldName + "-value"; + startPrecisionName = startFieldName + "-precision"; + endPrecisionName = endFieldName + "-precision"; + } + public Map validate(EditConfigurationVTwo editConfig, MultiValueEditSubmission editSub) { Map> existingLiterals = editConfig.getLiteralsInScope(); @@ -64,9 +75,11 @@ public class DateTimeIntervalValidationVTwo implements N3ValidatorVTwo { // return errors; // } // We need to ensure that the user has entered a start year or end year -- tlw72 - if ( literalListIsNull(formStartYear) && literalListIsNull(formStartYear) ) { - errors.put(startFieldName, "Date/time intervals must begin with a year. Please enter a start year or an end year."); - return errors; + if ( templateName != null && templateName.equals("dateTimeIntervalForm.ftl")) { + if ( literalListIsNull(formStartYear) && literalListIsNull(formEndYear) ) { + errors.put(startFieldName, "Date/time intervals must begin with a year. Please enter a start year, an end year or both."); + return errors; + } } //Assuming form start year and form end year are working in conjunction with multiple values int index; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java index 22c8fcb5c..7daa9743c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DateTimeIntervalFormGenerator.java @@ -92,7 +92,7 @@ public class DateTimeIntervalFormGenerator extends conf.addField(startField); conf.addField(endField); //Need to add validators - conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField")); + conf.addValidator(new DateTimeIntervalValidationVTwo("startField","endField","dateTimeIntervalForm.ftl")); //Adding additional data, specifically edit mode addFormSpecificData(conf, vreq); }