From e5aab7191bb6e26460e4f18e2e30b98f58281681 Mon Sep 17 00:00:00 2001 From: bdc34 Date: Tue, 11 Jan 2011 17:07:32 +0000 Subject: [PATCH] Fixing start date on interval for addRoleToPersonTwoStage form NIHVIVO-1646 --- productMods/edit/forms/addRoleToPersonTwoStage.jsp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index d6e79726..1ab781c0 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -49,7 +49,9 @@ <%@page import="edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement"%> <%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.Field"%> -<%@page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%> +<%@page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%> +<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.StartDateBeforeEndDate"%> +<%@page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.DateTimeIntervalValidation"%> <%! public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.forms.addRoleToPersonTwoStage.jsp"); @@ -341,7 +343,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. "object" : ["role", "${objectUriJson}", "URI" ], "n3required" : [ "${n3ForNewRole}", "${roleLabelAssertion}" ], - "n3optional" : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}", "${n3ForEnd}" ], + "n3optional" : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}", "${n3ForStart}", "${n3ForEnd}" ], "newResources" : { "role" : "${defaultNamespace}", "roleActivity" : "${defaultNamespace}", @@ -461,7 +463,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. VitroVocabulary.Precision.NONE.uri())); } - editConfig.addValidator(new StartYearBeforeEndYear("startField.value","endYear.value") ); + editConfig.addValidator(new DateTimeIntervalValidation("startField","endField") ); Model model = (Model) application.getAttribute("jenaOntModel"); String objectUri = (String) request.getAttribute("objectUri");