litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing problem PageController where it didn't go to the specified template. NIHVIVO-632

Browse source
This commit is contained in:
bdc34 2010-12-22 15:22:08 +00:00
parent 1569743afc
commit 769637111d
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java
View file

@ -70,10 +70,14 @@ public class PageController extends FreemarkerHttpServlet{
} }
private String getTemplate(Map<String, Object> mapForTemplate) { private String getTemplate(Map<String, Object> mapForTemplate) {
if( mapForTemplate.containsKey("bodyTemplate")) if( mapForTemplate.containsKey("page") ){
return (String) mapForTemplate.get("bodyTemplate"); Map page = (Map) mapForTemplate.get("page");
if( page != null && page.containsKey("bodyTemplate"))
return (String) page.get("bodyTemplate");
else else
return DEFAULT_BODY_TEMPLATE; return DEFAULT_BODY_TEMPLATE;
}else
return DEFAULT_BODY_TEMPLATE;
} }
protected Map<String,Object> getAdditionalDataForPage(VitroRequest vreq, String pageUri, Map<String,Object>page ) { protected Map<String,Object> getAdditionalDataForPage(VitroRequest vreq, String pageUri, Map<String,Object>page ) {