From f423774b59cc025163765b2ea00bf58fa4342d5b Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Mon, 4 Apr 2016 13:15:06 +0200
Subject: [PATCH] OO-1970 fix nullpointer for non existing company logo
---
.../java/org/olat/user/HomePageDisplayController.java | 10 ++++++----
src/main/resources/serviceconfig/olat.properties | 2 ++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/user/HomePageDisplayController.java b/src/main/java/org/olat/user/HomePageDisplayController.java
index 40e26fdaa62..1abbd19ee98 100644
--- a/src/main/java/org/olat/user/HomePageDisplayController.java
+++ b/src/main/java/org/olat/user/HomePageDisplayController.java
@@ -125,10 +125,12 @@ public class HomePageDisplayController extends BasicController {
if(UserModule.isLogoByProfileEnabled()) {
File logo = DisplayPortraitManager.getInstance().getBigLogo(homeIdentity.getName());
- ImageComponent logoCmp = new ImageComponent(ureq.getUserSession(), "logo");
- logoCmp.setMedia(logo);
- logoCmp.setMaxWithAndHeightToFitWithin(300, 66);
- mainVC.put("logo", logoCmp);
+ if (logo != null) {
+ ImageComponent logoCmp = new ImageComponent(ureq.getUserSession(), "logo");
+ logoCmp.setMedia(logo);
+ logoCmp.setMaxWithAndHeightToFitWithin(300, 66);
+ mainVC.put("logo", logoCmp);
+ }
}
putInitialPanel(mainVC);
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 04acf535a8e..785626d39c1 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -674,6 +674,8 @@ userinfos.tunnelcoursebuildingblock=disabled
userDisplayName=userDisplayName_lastname_firstname
userDisplayName.values=userDisplayName_firstname_lastname, userDisplayName_lastname_firstname
+# An additional image attached to the user profile, eg. for the company logo.
+# Diplayed on the users vising card
user.logoByProfile=disabled
user.logoByProfile.values=enabled,disabled
--
GitLab