You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/01 13:11:58 UTC
[isis] 01/03: ISIS-2158: fixes brandLogoHeader,
cannot fallback to applicationName
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 32eef8c4a138daafd92f97d2d70e7cbb8094df30
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jan 1 11:33:57 2020 +0000
ISIS-2158: fixes brandLogoHeader, cannot fallback to applicationName
because it needs to be a URL
---
.../java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
index 190f765..d57a5a8 100644
--- a/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/viewer/wicket/WebAppConfiguration.java
@@ -84,7 +84,7 @@ public class WebAppConfiguration {
this.applicationJs = ignoreLeadingSlash(application.getJs());
this.brandLogoHeader = Optional.ofNullable(honorContextPath(application.getBrandLogoHeader()))
- .orElse(this.applicationName);
+ .orElse(null);
this.brandLogoSignin = Optional.ofNullable(honorContextPath(application.getBrandLogoSignin()))
.orElse(null);
this.faviconUrl = honorContextPath(application.getFaviconUrl());