[isis] 02/07: ISIS-2158: fixes sign-in page, which showed bad img link if no image was configured

[da...@apache.org]

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 cdd40776d5308a0e6a57c0c5aafe7f105bf99c2d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Dec 3 10:17:58 2019 +0000

    ISIS-2158: fixes sign-in page, which showed bad img link if no image was configured
    
    ... the brandLogoSignIn is a URL, so cannot fall back to being the application name.
---
 .../main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java | 2 +-
 .../isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java      | 1 +
 .../org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java b/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java
index f1f488a..62812a0 100644
--- a/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/viewer/wicket/ui/WebAppConfiguration.java
@@ -76,7 +76,7 @@ public class WebAppConfiguration {
         this.brandLogoHeader = Optional.ofNullable(honorContextPath(application.getBrandLogoHeader()))
                 .orElse(this.applicationName);
         this.brandLogoSignin = Optional.ofNullable(honorContextPath(application.getBrandLogoSignin()))
-                .orElse(this.applicationName);
+                .orElse(null);
         this.faviconUrl = honorContextPath(application.getFaviconUrl());
         
         this.faviconContentType = application.getFaviconContentType();
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
index 5e8f0f3..e4cc2b5 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/BrandLogo.java
@@ -28,6 +28,7 @@ import org.apache.isis.viewer.wicket.ui.WebAppConfiguration;
 /**
  * A component used as a brand logo in the top-left corner of the navigation bar
  */
+@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
 public class BrandLogo extends WebComponent {
 
     private static final long serialVersionUID = 1L;
diff --git a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
index 5c7a1a2..2cd1efd 100644
--- a/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
+++ b/core/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/IsisSignInPanel.java
@@ -44,6 +44,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
  * {@link de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel}
  * for Bootstrap styled error messages
  */
+@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
 public class IsisSignInPanel extends SignInPanel {
 
     private static final long serialVersionUID = 1L;