From eb21c265bea7b7792d8b12121f72c9f3d151197b Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 9 Jul 2012 16:38:49 +0000 Subject: [PATCH] merging 4217 to trunk --- .../freemarker/ManageGrantsForIndividualController.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java index 79655cbb..ff0d5ace 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManageGrantsForIndividualController.java @@ -82,11 +82,11 @@ public class ManageGrantsForIndividualController extends FreemarkerHttpServlet { + " ?subject ?roleProp ?role . \n" + " ?roleProp rdfs:subPropertyOf core:hasResearcherRole . \n" + " ?role vitro:mostSpecificType ?subclass \n" - + " OPTIONAL { ?role core:roleRealizedIn ?activity \n" - + " OPTIONAL { ?activity rdfs:label ?label2 } \n" + + " OPTIONAL { ?role core:roleRealizedIn ?activity . \n" + + " ?activity rdfs:label ?label2 \n" + " } \n" - + " OPTIONAL { ?role core:roleContributesTo ?activity \n" - + " OPTIONAL { ?activity rdfs:label ?label2 } \n" + + " OPTIONAL { ?role core:roleContributesTo ?activity . \n" + + " ?activity rdfs:label ?label2 \n" + " } \n" + " OPTIONAL { ?role core:hideFromDisplay ?hideThis } \n" + "} ORDER BY ?subclass ?label2";