From e62c16928f3012ca772f62f8d7701e01e780ec5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Fri, 5 Feb 2010 16:26:17 +0100
Subject: [PATCH] ItEr46S18RFComportamentoGraficoPlanificadorItEr31S05: Only
 setting initial zoom level if parameter exists

---
 .../web/planner/company/CompanyPlanningController.java     | 7 ++++---
 .../web/planner/order/OrderPlanningController.java         | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
index 83b6df6db..b5a3e9fb2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
@@ -92,9 +92,10 @@ public class CompanyPlanningController implements Composer{
                 && !(parameters.isEmpty())) {
             zoomLevelParameter = parameters.get("zoom")[0];
         }
-        planner
-                .setInitialZoomLevel(ZoomLevel
-                        .getFromString(zoomLevelParameter));
+        if (zoomLevelParameter != null) {
+            planner.setInitialZoomLevel(ZoomLevel
+                    .getFromString(zoomLevelParameter));
+        }
         planner.setAreContainersExpandedByDefault(Planner
                 .guessContainersExpandedByDefault(parameters));
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
index d02c2558d..5f631054a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningController.java
@@ -111,9 +111,10 @@ public class OrderPlanningController implements Composer {
                 && !(parameters.isEmpty())) {
             zoomLevelParameter = parameters.get("zoom")[0];
         }
-        planner
-                .setInitialZoomLevel(ZoomLevel
-                        .getFromString(zoomLevelParameter));
+        if (zoomLevelParameter != null) {
+            planner.setInitialZoomLevel(ZoomLevel
+                    .getFromString(zoomLevelParameter));
+        }
         planner.setAreContainersExpandedByDefault(Planner
                 .guessContainersExpandedByDefault(parameters));
         updateConfiguration();