litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-908 Create additional param in presenter role form so button text can differ from form field labels ("presenter" vs. "presentation")

Browse source
This commit is contained in:
rjy7 2010-07-23 17:25:35 +00:00
parent 57c954bf2b
commit 417363603d
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
productMods/edit/forms/addPresenterRoleToPerson.jsp
View file

@ -3,6 +3,7 @@
<jsp:include page="addRoleToPersonTwoStage.jsp"> <jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="presentation" /> <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="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />
<jsp:param name="numDateFields" value="1" /> <jsp:param name="numDateFields" value="1" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" /> <jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />

8
productMods/edit/forms/addRoleToPersonTwoStage.jsp
View file

@ -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="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="roleType">${param.roleType}</c:set>
<c:set var="roleActivityType_optionsType" >${param.roleActivityType_optionsType}</c:set> <c:set var="roleActivityType_optionsType" >${param.roleActivityType_optionsType}</c:set>
<c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</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("gYearDatatypeUriJson", MiscWebUtils.escape(XSD.gYear.toString()));
vreq.setAttribute("roleActivityTitleCase", TitleCase.toTitleCase(vreq.getParameter("roleActivityTypeLabel"))); 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 ); ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI( predicateUri );
if( op != null && op.getURIInverse() != null ){ if( op != null && op.getURIInverse() != null ){
%> <c:set var="inversePredicate"><%=op.getURIInverse()%></c:set> <% %> <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:choose>
<c:when test="<%= request.getAttribute(\"objectUri\")!=null %>"> <c:when test="<%= request.getAttribute(\"objectUri\")!=null %>">
<c:set var="titleText" value="Edit" /> <c:set var="titleText" value="Edit" />
<c:set var="submitButtonText" value="Edit ${roleActivityTitleCase}" /> <c:set var="submitButtonText" value="Edit ${buttonLabel}" />
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:set var="titleText" value="Create a new" /> <c:set var="titleText" value="Create a new" />
<c:set var="editMode" value="add" /> <c:set var="editMode" value="add" />
<c:set var="submitButtonText" value="${roleActivityTitleCase}" /> <c:set var="submitButtonText" value="${buttonLabel}" />
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>