From 9bd545bfbb00d109889418dae3133b2d1c138366 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 8 Aug 2012 20:46:30 +0000
Subject: [PATCH] merging r4254 to the trunk

---
 productMods/config/listViewConfig-hasRole.xml      |  8 +++++---
 .../partials/individual/propStatement-hasRole.ftl  | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml
index e75ebcfd..94ab38bc 100644
--- a/productMods/config/listViewConfig-hasRole.xml
+++ b/productMods/config/listViewConfig-hasRole.xml
@@ -17,8 +17,9 @@
                         ?roleLabel 
                         ?activity ?activityName 
                         ?activityLabel
-                        ?dateTimeStart ?dateTimeEnd WHERE {
-                        
+                        ?dateTimeStart ?dateTimeEnd 
+                        ?hideThis
+        WHERE {                
             ?subject ?property ?role  
             
             OPTIONAL {  ?role core:roleRealizedIn ?activity 
@@ -40,6 +41,7 @@
             }           
             
             OPTIONAL { ?role rdfs:label ?roleLabel }
+            OPTIONAL { ?role core:hideFromDisplay ?hideThis }
             OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval 
                        OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
                                   ?dateTimeStartValue core:dateTime ?dateTimeStart 
@@ -48,7 +50,7 @@
                                   ?dateTimeEndValue core:dateTime ?dateTimeEnd 
                        }
             }
-            NOT EXISTS { ?role core:hideFromDisplay ?hideThis }  
+      #      NOT EXISTS { ?role core:hideFromDisplay ?hideThis }  
             <critical-data-required>
             FILTER ( bound(?activity) )
             </critical-data-required>
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
index 0e83d573..6c3634c0 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
@@ -13,6 +13,16 @@
 <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
      next statement -->
 <#macro showRole statement>
+<#if statement.hideThis?has_content>
+    <span class="hideThis">&nbsp;</span>
+    <script type="text/javascript" >
+        $('span.hideThis').parent().parent().addClass("hideThis");
+        if ( $('h3#hasResearcherRole').attr('class').length == 0 ) {
+            $('h3#hasResearcherRole').addClass('hiddenGrants');
+        }
+        $('span.hideThis').parent().remove();
+    </script>
+<#else>
     <#local linkedIndividual>
         <#if statement.activity??>
             <a href="${profileUrl(statement.uri("activity"))}" title="activity name">${statement.activityLabel!statement.activityName}</a>
@@ -26,6 +36,6 @@
         <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
     </#local>
     
-    ${linkedIndividual} ${statement.roleLabel!} ${dateTime!}
-
+    ${linkedIndividual} ${statement.roleLabel!} ${dateTime!} 
+</#if>
 </#macro>
\ No newline at end of file