From dd4acf965bb692a3319ae3f7ece3e4cd43d9f1f7 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 22 Dec 2010 23:10:12 +0000
Subject: [PATCH] NIHVIVO-1510 Collated custom list views

---
 .../CollatedObjectPropertyTemplateModel.java          |  8 ++++----
 .../partials/individual/individual-properties.ftl     | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
index 9ec7b8723..1505e4d43 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/CollatedObjectPropertyTemplateModel.java
@@ -33,10 +33,10 @@ public class CollatedObjectPropertyTemplateModel extends ObjectPropertyTemplateM
         super(op, subject, vreq); 
 
         // RY Temporarily throw an error because collation hasn't been implemented yet.
-        boolean error = true;
-        if (error) {
-            throw new Exception("Collated object property not implemented yet");
-        }
+//        boolean error = true;
+//        if (error) {
+//            throw new Exception("Collated object property not implemented yet");
+//        }
         
         /* Change the approach to collation:
          * Custom views can get the subclasses in the query. Must use a term ?subclass - throw error if not.
diff --git a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
index 81a030310..396182cac 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/individual-properties.ftl
@@ -32,7 +32,7 @@
 
                     <#-- object property -->      
                     <#elseif property.collatedBySubclass>                             
-                        <@objectPropertySubclassList property />
+                        <@collatedObjectPropertyList property />
                     <#else>
                         <@objectPropertyList property.statements property.template />
                     </#if>  
@@ -52,10 +52,11 @@
     </#list> 
 </#macro>
 
-<#macro objectPropertySubclassList property>
-    <#list property.subclasses as subclass>
-        <h3>${subclass}</h3>
-        <@objectPropertyList subclass.statements property.template />
+<#macro collatedObjectPropertyList property>
+    <#assign subclasses = property.subclasses>
+    <#list subclasses?keys as subclass>
+        <h3>${subclass?lower_case}</h3>
+        <@objectPropertyList subclasses[subclass] property.template /> 
     </#list>
 </#macro>