Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
f423774b
Commit
f423774b
authored
8 years ago
by
gnaegi
Browse files
Options
Downloads
Patches
Plain Diff
OO-1970 fix nullpointer for non existing company logo
parent
382cda13
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/org/olat/user/HomePageDisplayController.java
+6
-4
6 additions, 4 deletions
src/main/java/org/olat/user/HomePageDisplayController.java
src/main/resources/serviceconfig/olat.properties
+2
-0
2 additions, 0 deletions
src/main/resources/serviceconfig/olat.properties
with
8 additions
and
4 deletions
src/main/java/org/olat/user/HomePageDisplayController.java
+
6
−
4
View file @
f423774b
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/serviceconfig/olat.properties
+
2
−
0
View file @
f423774b
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment