From 3c1b999a4b2b52f043aa1d43a55a5f1c67e66f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Mon, 5 Sep 2011 18:36:55 +0200
Subject: [PATCH] Added support for custom logos in reports

FEA: ItEr75S04BugFixing
---
 .../web/reports/NavalplannerReportController.java        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java
index f6705cac8..9d715096e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java
@@ -30,6 +30,8 @@ import java.util.Set;
 import net.sf.jasperreports.engine.JRDataSource;
 import net.sf.jasperreports.engine.JRParameter;
 
+import org.navalplanner.business.common.Registry;
+import org.springframework.transaction.annotation.Transactional;
 import org.zkoss.util.Locales;
 import org.zkoss.zk.au.out.AuDownload;
 import org.zkoss.zk.ui.Executions;
@@ -100,7 +102,12 @@ public abstract class NavalplannerReportController extends GenericForwardCompose
 
     protected Map<String, Object> getParameters() {
         Map<String, Object> parameters = new HashMap<String, Object>();
-        parameters.put("logo", String.format("/logos/%s/logo.png", getLanguage()));
+        String companyLogo = Registry.getConfigurationDAO()
+                .getConfigurationWithReadOnlyTransaction().getCompanyLogoURL();
+        if (companyLogo == "") {
+            companyLogo = "/logos/logo.png";
+        }
+        parameters.put("logo", companyLogo);
         parameters.put(JRParameter.REPORT_LOCALE, getCurrentLocale());
         return parameters;
     }