From 769637111df01c192a9cac9ae1fbb5e2c6fd3b9d Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 22 Dec 2010 15:22:08 +0000
Subject: [PATCH] Fixing problem PageController where it didn't go to the
 specified template. NIHVIVO-632

---
 .../webapp/controller/freemarker/PageController.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java
index 1147311a4..3e96be365 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java
@@ -70,9 +70,13 @@ public class PageController extends FreemarkerHttpServlet{
     }
 
     private String getTemplate(Map<String, Object> mapForTemplate) {
-        if( mapForTemplate.containsKey("bodyTemplate"))
-            return (String) mapForTemplate.get("bodyTemplate");
-        else
+        if( mapForTemplate.containsKey("page") ){
+            Map page = (Map) mapForTemplate.get("page");
+            if( page != null && page.containsKey("bodyTemplate"))
+                return (String) page.get("bodyTemplate");
+            else
+                return DEFAULT_BODY_TEMPLATE;
+        }else
             return DEFAULT_BODY_TEMPLATE;        
     }