From b2dc8f00601f99cff28242adeba47cb9b5c9e46e Mon Sep 17 00:00:00 2001 From: bdc34 Date: Mon, 12 Jul 2010 16:10:15 +0000 Subject: [PATCH] Change to EditSubmission for blank URIs of new resources Adding post edit redirect for addPublicationToAuthor.jsp --- .../user/vivo-core-1.1-annotations.rdf | 1 + .../edit/forms/addPublicationToAuthor.jsp | 18 ++-- .../templates/entity/grantRoleShortView.jsp | 99 +++++++++++++++++++ 3 files changed, 109 insertions(+), 9 deletions(-) create mode 100644 productMods/templates/entity/grantRoleShortView.jsp diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf index fe62e356..2a6bf66e 100644 --- a/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf @@ -4259,6 +4259,7 @@ display level -1 + grantRoleShortView.jsp core diff --git a/productMods/edit/forms/addPublicationToAuthor.jsp b/productMods/edit/forms/addPublicationToAuthor.jsp index f8c9d376..fc081abc 100644 --- a/productMods/edit/forms/addPublicationToAuthor.jsp +++ b/productMods/edit/forms/addPublicationToAuthor.jsp @@ -68,11 +68,11 @@ core:informationResourceInAuthorship (InformationResource : Authorship) - invers SPARQL queries for existing values. --%> - ?newPub a ?pubType . + ?pubUri a ?pubType . - ?newPub <${label}> ?title . + ?pubUri <${label}> ?title . <%-- This applies to both a new and an existing publication --%> @@ -95,11 +95,11 @@ SPARQL queries for existing values. --%> @prefix core: <${vivoCore}> . - ?newPub a ?pubType ; + ?pubUri a ?pubType ; <${label}> ?title . - ?authorshipUri core:linkedInformationResource ?newPub . - ?newPub core:informationResourceInAuthorship ?authorshipUri . + ?authorshipUri core:linkedInformationResource ?pubUri . + ?pubUri core:informationResourceInAuthorship ?authorshipUri . <%-- Must be all one line for JavaScript. Must use ?individual since Javascript will look for that property in the data returned. --%> @@ -114,7 +114,7 @@ PREFIX core: <${vivoCore}> SELECT ?individual WHERE {<${subjectUri}> core:author { "formUrl" : "${formUrl}", "editKey" : "${editKey}", - "urlPatternToReturnTo" : "", // this will be a problem in the case of a new infoResource - we don't have the uri yet + "urlPatternToReturnTo" : "/individual", "subject" : ["person", "${subjectUriJson}" ], "predicate" : ["predicate", "${predicateUriJson}" ], @@ -126,7 +126,7 @@ PREFIX core: <${vivoCore}> SELECT ?individual WHERE {<${subjectUri}> core:author "${newPubNameAssertion}", "${newPubTypeAssertion}" ], "newResources" : { "authorshipUri" : "${defaultNamespace}", - "newPub" : "${defaultNamespace}" }, + "pubUri" : "${defaultNamespace}" }, "urisInScope" : { }, "literalsInScope": { }, @@ -161,7 +161,7 @@ PREFIX core: <${vivoCore}> SELECT ?individual WHERE {<${subjectUri}> core:author "assertions" : [ "${newPubTypeAssertion}" ] }, "pubUri" : { - "newResource" : "false", + "newResource" : "true", "validators" : [ ], "optionsType" : "UNDEFINED", "literalOptions" : [ ], @@ -189,7 +189,7 @@ PREFIX core: <${vivoCore}> SELECT ?individual WHERE {<${subjectUri}> core:author Model model = (Model) application.getAttribute("jenaOntModel"); String objectUri = (String) request.getAttribute("objectUri"); editConfig.prepareForNonUpdate(model); // we're only adding new, not editing existing - + editConfig.setEntityToReturnTo("?pubUri"); List customJs = new ArrayList(Arrays.asList(JavaScript.JQUERY_UI.path(), JavaScript.UTILS.path(), JavaScript.CUSTOM_FORM_UTILS.path(), diff --git a/productMods/templates/entity/grantRoleShortView.jsp b/productMods/templates/entity/grantRoleShortView.jsp new file mode 100644 index 00000000..fabee7e2 --- /dev/null +++ b/productMods/templates/entity/grantRoleShortView.jsp @@ -0,0 +1,99 @@ +<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> + + +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib uri="http://vitro.mannlib.cornell.edu/vitro/tags/StringProcessorTag" prefix="p" %> + +http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole +http://vivoweb.org/ontology/core#roleIn +grant + + + <%-- individual is the OBJECT of the property referenced -- the Role individual, not the Person or grant --%> + <%-- c:set var="authorRank" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#authorRank'].dataPropertyStatements[0].data}"/ --%> + + + + + <%-- SUBJECT is a Person, so get info from other part of the role --%> + + + + + + + <%-- --%> + + + + <%-- this Role is not linked to a anything yet; use name as a placeholder and add link to the Role so user can add more information --%> + + + + + + + + + (no ${roleActivityLabel} linked yet) + + + + + + <%-- SUBJECT is an activity of some sort, so get info from the Role about the related Person --%> + + + + <%-- there is a related Person --%> + + + + + + + + <%-- only an author name has been specified --%> + + + + + <%-- no related Person yet (likely from before custom form available) --%> + + + + + + + + + + + + + + + + + + + + + + ">${name} ${label} + + + ${name} ${label} + + + + + + + + + + + +