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

Merge r1193:1195 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-27 00:56:55 +00:00
parent abe14ec0ac
commit b4e4619619
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -130,15 +130,15 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
} }
} }
if( mode == 1 ) if( mode == 1 )
log.debug("This form will be for an add"); log.debug("This form will be for an add. Setting mode to " + mode);
else if(mode == 2){ else if(mode == 2){
log.debug("This form will be for a normal edit"); log.debug("This form will be for a normal edit. Setting mode to " + mode);
%> <c:set var="editMode" value="edit"/><% %> <c:set var="editMode" value="edit"/><%
} else if(mode == 3){ } else if(mode == 3){
log.debug("This form will be for the repair of a bad role node"); log.debug("This form will be for the repair of a bad role node. Setting mode to " + mode);
%> <c:set var="editMode" value="repair"/><% %> <c:set var="editMode" value="repair"/><%
}else if(mode == 4) }else if(mode == 4)
log.debug("No form will be shown, since there are multiple core:roleIn statements"); log.debug("No form will be shown, since there are multiple core:roleIn statements. Setting mode to " + mode);
%> %>
<c:set var="vivoOnt" value="http://vivoweb.org/ontology" /> <c:set var="vivoOnt" value="http://vivoweb.org/ontology" />
@ -375,10 +375,11 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<c:set var="yearMonthHint" value="<span class='hint'>(YYYY-MM)</span>" /> <c:set var="yearMonthHint" value="<span class='hint'>(YYYY-MM)</span>" />
<c:choose> <c:choose>
<%-- Includes edit AND repair mode --%>
<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 ${buttonLabel}" /> <c:set var="submitButtonText" value="Edit ${buttonLabel}" />
<c:set var="disabledVal" value="disabled" /> <c:set var="disabledVal">${editMode == "repair" ? "" : "disabled" }</c:set>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:set var="titleText" value="Create" /> <c:set var="titleText" value="Create" />
@ -441,11 +442,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" /> <c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" />
<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" /> <c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />
<%-- Must be all one line for JavaScript. --%>
<c:set var="sparqlForAcFilter">
SELECT ?indUri WHERE {<${subjectUri}> <${predicateUri}> ?role . ?role <${vivoCore}roleIn> ?indUri .}
</c:set>
<script type="text/javascript"> <script type="text/javascript">
var customFormData = { var customFormData = {
sparqlQueryUrl: '${sparqlQueryUrl}', sparqlQueryUrl: '${sparqlQueryUrl}',