LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FreeMarkerPresentationManager did not handle missing application attribute (Content Center is missing it) correctly 

git-svn-id: https://svn.libreccm.org/ccm/trunk@6249 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2019-10-04 14:41:52 +00:00
parent bfc8434d9d
commit d9fe7000d3
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ccm-themedirector/src/org/libreccm/theming/FreeMarkerPresentationManager.java
View File

@ -150,8 +150,18 @@ public class FreeMarkerPresentationManager implements PresentationManager {
final NamedNodeMap pageAttrs = root.getAttributes(); final NamedNodeMap pageAttrs = root.getAttributes();
final Node applicationNameAttr = pageAttrs.getNamedItem("application"); final Node applicationNameAttr = pageAttrs.getNamedItem("application");
final Node applicationClassAttr = pageAttrs.getNamedItem("class"); final Node applicationClassAttr = pageAttrs.getNamedItem("class");
final String applicationName = applicationNameAttr.getNodeValue(); final String applicationName;
final String applicationClass = applicationClassAttr.getNodeValue(); if (applicationNameAttr == null) {
applicationName = "none";
} else {
applicationName = applicationNameAttr.getNodeValue();
}
final String applicationClass;
if (applicationClassAttr == null) {
applicationClass = "none";
} else {
applicationClass = applicationClassAttr.getNodeValue();
}
final Optional<ApplicationTemplate> applicationTemplate final Optional<ApplicationTemplate> applicationTemplate
= findApplicationTemplate( = findApplicationTemplate(