Skip to content
Snippets Groups Projects
Commit f423774b authored by gnaegi's avatar gnaegi
Browse files

OO-1970 fix nullpointer for non existing company logo

parent 382cda13
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment