From 417363603d6800ac5f1c4d643a5102151a27abf3 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 23 Jul 2010 17:25:35 +0000
Subject: [PATCH] NIHVIVO-908 Create additional param in presenter role form so
 button text can differ from form field labels ("presenter" vs.
 "presentation")

---
 productMods/edit/forms/addPresenterRoleToPerson.jsp | 1 +
 productMods/edit/forms/addRoleToPersonTwoStage.jsp  | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/productMods/edit/forms/addPresenterRoleToPerson.jsp b/productMods/edit/forms/addPresenterRoleToPerson.jsp
index 29adaab6..bc5f0e84 100644
--- a/productMods/edit/forms/addPresenterRoleToPerson.jsp
+++ b/productMods/edit/forms/addPresenterRoleToPerson.jsp
@@ -3,6 +3,7 @@
 
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="presentation" />
+	<jsp:param name="buttonLabel" value="presenter" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />	
 	<jsp:param name="numDateFields" value="1" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 5eb2c30b..afed3449 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -64,6 +64,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 --%>
 
 <c:set var="roleActivityTypeLabel">${param.roleActivityTypeLabel}</c:set>
+<c:set var="buttonLabel" scope="request">${! empty param.buttonLabel ? param.buttonLabel : param.roleActivityTypeLabel}</c:set>
 <c:set var="roleType">${param.roleType}</c:set>
 <c:set var="roleActivityType_optionsType" >${param.roleActivityType_optionsType}</c:set>
 <c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</c:set> 
@@ -89,6 +90,9 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
     vreq.setAttribute("gYearDatatypeUriJson", MiscWebUtils.escape(XSD.gYear.toString()));
     
     vreq.setAttribute("roleActivityTitleCase", TitleCase.toTitleCase(vreq.getParameter("roleActivityTypeLabel")));
+    String buttonLabel = (String) vreq.getAttribute("buttonLabel");
+    vreq.setAttribute("buttonLabel", TitleCase.toTitleCase(buttonLabel));
+    
     ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI( predicateUri ); 
     if( op != null &&  op.getURIInverse() != null ){
 		%> <c:set var="inversePredicate"><%=op.getURIInverse()%></c:set> <%
@@ -381,12 +385,12 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 <c:choose>
     <c:when test="<%= request.getAttribute(\"objectUri\")!=null %>">    	
         <c:set var="titleText" value="Edit" />        
-        <c:set var="submitButtonText" value="Edit ${roleActivityTitleCase}" />
+        <c:set var="submitButtonText" value="Edit ${buttonLabel}" />
     </c:when>
     <c:otherwise>
         <c:set var="titleText" value="Create a new" />
         <c:set var="editMode" value="add" />
-        <c:set var="submitButtonText" value="${roleActivityTitleCase}" />
+        <c:set var="submitButtonText" value="${buttonLabel}" />
     </c:otherwise>
 </c:choose>