RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix problems related with null configuration properties

Browse source 
FEA: ItEr65S06BugFixing
This commit is contained in:
Lorenzo Tilve 2010-12-16 12:32:38 +01:00
parent dd65d04880
commit 80bd3a84be
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java
View file

@ -73,9 +73,9 @@ public class Configuration extends BaseEntity {
private ProgressType progressType = ProgressType.SPREAD_PROGRESS;
private String companyLogoURL;
private String companyLogoURL = "";
private Boolean scenariosVisible;
private Boolean scenariosVisible = false;
public void setDefaultCalendar(BaseCalendar defaultCalendar) {
this.defaultCalendar = defaultCalendar;

2
navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java
View file

@ -89,7 +89,7 @@ public class TemplateController extends GenericForwardComposer {
}
public String getCompanyLogoURL() {
if (templateModel == null) {
if (templateModel == null || templateModel.getCompanyLogoURL() == null) {
return "";
}
return templateModel.getCompanyLogoURL().trim();