diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp index e29208f7..3ff805ac 100644 --- a/productMods/edit/forms/addGrantRoleToPerson.jsp +++ b/productMods/edit/forms/addGrantRoleToPerson.jsp @@ -72,8 +72,8 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest ?person ?rolePredicate ?role. ?role rdf:type ?roleType . - ?role core:relatedRole ?grant . - ?grant core:inRole ?role . + ?role core:roleIn ?grant . + ?grant core:relatedRole ?role . diff --git a/productMods/templates/entity/grantCopiRoleShortView.jsp b/productMods/templates/entity/grantCopiRoleShortView.jsp index 96631196..183230d4 100644 --- a/productMods/templates/entity/grantCopiRoleShortView.jsp +++ b/productMods/templates/entity/grantCopiRoleShortView.jsp @@ -2,6 +2,7 @@ - - + + + diff --git a/productMods/templates/entity/grantPiRoleShortView.jsp b/productMods/templates/entity/grantPiRoleShortView.jsp index 9de6429b..4119de06 100644 --- a/productMods/templates/entity/grantPiRoleShortView.jsp +++ b/productMods/templates/entity/grantPiRoleShortView.jsp @@ -2,6 +2,7 @@ - + + diff --git a/productMods/templates/entity/roleShortView.jsp b/productMods/templates/entity/roleShortView.jsp index 50064ace..acc8627f 100644 --- a/productMods/templates/entity/roleShortView.jsp +++ b/productMods/templates/entity/roleShortView.jsp @@ -8,7 +8,8 @@ This short view is intended to be called to handle short views for roles The following vars should be set by the jsp that is calling this short view - personToRolePredicate: URI of the person to role predicate. + personToRolePredicate: URI of the person to role predicate. + roleToPersonPredicate: URI of the role to person predicate. roleActivityToRolePredicate: URI of the activity to role predicate. roleActivityLabel: human readable label of activity. --%> @@ -22,12 +23,10 @@ <%-- 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 --%> @@ -50,25 +49,20 @@ <%-- there is a related Person --%> - - - - - - + + + +<%-- --%> + + - <%-- only an author name has been specified --%> - - - - - <%-- no related Person yet (likely from before custom form available) --%> - + <%-- this is a Role with out a Person (likely from before custom form available) --%> + - + - +