From 80bd3a84be6a16b5b3ba95ccd636714426a14176 Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Thu, 16 Dec 2010 12:32:38 +0100 Subject: [PATCH] Fix problems related with null configuration properties FEA: ItEr65S06BugFixing --- .../navalplanner/business/common/entities/Configuration.java | 4 ++-- .../java/org/navalplanner/web/common/TemplateController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java index 69d1e1c66..552c969ed 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/entities/Configuration.java @@ -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; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java index 82740ecab..b553226b5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateController.java @@ -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();