From 9184b6f70fb3de6bbf137b44e782f77e8e0ef05e Mon Sep 17 00:00:00 2001 From: bdc34 Date: Wed, 5 Jan 2011 22:35:25 +0000 Subject: [PATCH] Working on converting addRoleToPersonTwoStage to date time with precision NIHVIVO-631 --- .../vitro/webapp/edit/n3editing/StartYearBeforeEndYear.java | 3 ++- .../vitro/webapp/web/jsptags/InputElementFormattingTag.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/StartYearBeforeEndYear.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/StartYearBeforeEndYear.java index 8add299ee..fa5c5226f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/StartYearBeforeEndYear.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/StartYearBeforeEndYear.java @@ -56,7 +56,8 @@ public class StartYearBeforeEndYear implements N3Validator { errors.put(endFieldName, "End year must be after start year"); } } catch (NumberFormatException nfe) { - + errors.put(startFieldName, "could not format star or end date"); + errors.put(endFieldName, "could not format star or end date"); } return errors; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java index 8f1dd7daf..54add4962 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/jsptags/InputElementFormattingTag.java @@ -438,8 +438,8 @@ public class InputElementFormattingTag extends TagSupport { // } - if ((getType()==null || getType().equals("")) && field.getEditElement() == null ){ - log.error("Error in doStartTag: input element type is blank or not specified."); + if ((getType()==null || getType().equals("")) && (field != null && field.getEditElement() == null )){ + log.error("Error in doStartTag: input element type not specified and editElement not specified."); } // set ProhibitedFromSearch object so picklist doesn't show