Commit 7fee5a56 by Tuomas Riihimäki

image layout stuff

1 parent 501934a0
...@@ -75,8 +75,9 @@ public class LayoutView { ...@@ -75,8 +75,9 @@ public class LayoutView {
{ {
selectedSet = new HashSet<>(); selectedSet = new HashSet<>();
selectedTop = menubean.findNavigation(getPagepath()); selectedTop = menubean.findNavigation(getPagepath());
if(selectedTop == null) return null; if (selectedTop == null)
return null;
while (selectedTop.getParent() != null) { while (selectedTop.getParent() != null) {
logger.info("Traversing to top {}, key {}", selectedTop, selectedTop.getKey()); logger.info("Traversing to top {}, key {}", selectedTop, selectedTop.getKey());
selectedSet.add(selectedTop); selectedSet.add(selectedTop);
...@@ -160,7 +161,7 @@ public class LayoutView { ...@@ -160,7 +161,7 @@ public class LayoutView {
// return ""; // return "";
// } // }
public boolean getIsHeaderImage() public boolean getHeaderIsImage()
{ {
return getHeaderimage() != null; return getHeaderimage() != null;
} }
...@@ -176,6 +177,8 @@ public class LayoutView { ...@@ -176,6 +177,8 @@ public class LayoutView {
} else { } else {
headerimage = new DefaultStreamedContent(new ByteArrayInputStream(logo.getByteValue()), logo.getByteMime()); headerimage = new DefaultStreamedContent(new ByteArrayInputStream(logo.getByteValue()), logo.getByteMime());
} }
} else {
headertext = "logo_not_set";
} }
} }
return headerimage; return headerimage;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!