From 08a54a6ff730d02e4b086fe87169f4028af69408 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Thu, 14 Apr 2011 09:15:12 +0200
Subject: [PATCH] Improved design of errors and fixed NullPointerException when
 clicking in continue.

FEA: ItEr74S04BugFixing
---
 .../java/org/navalplanner/web/error/PageForErrorOnEvent.java  | 1 +
 navalplanner-webapp/src/main/webapp/common/error.zul          | 4 ++--
 navalplanner-webapp/src/main/webapp/common/event_error.zul    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
index 9dc99d1a5..21e09127e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/error/PageForErrorOnEvent.java
@@ -46,6 +46,7 @@ public class PageForErrorOnEvent extends GenericForwardComposer {
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
         logError();
+        modalWindow = comp;
         stacktrace.setValue(getStacktrace());
     }
 
diff --git a/navalplanner-webapp/src/main/webapp/common/error.zul b/navalplanner-webapp/src/main/webapp/common/error.zul
index a89858afd..b8c9354a0 100644
--- a/navalplanner-webapp/src/main/webapp/common/error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/error.zul
@@ -19,7 +19,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <?page title="${i18n:_('NavalPlan: Runtime Error')}" ?>
-<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
+<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan.css"?>
 <?link rel="stylesheet" type="text/css" href="/common/css/navalplan_zk.css"?>
 <zk>
@@ -46,7 +46,7 @@
                             </row>
                             <row>
                                 <label value="${i18n:_('Stacktracke:')}" />
-                                <textbox id="stacktrace" rows="20" width="600px" />
+                                <textbox id="stacktrace" rows="20" width="600px" readonly="true" />
                             </row>
                         </rows>
                     </grid>
diff --git a/navalplanner-webapp/src/main/webapp/common/event_error.zul b/navalplanner-webapp/src/main/webapp/common/event_error.zul
index ce77affe8..71ce1ff18 100644
--- a/navalplanner-webapp/src/main/webapp/common/event_error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/event_error.zul
@@ -41,7 +41,7 @@
                     </row>
                     <row>
                         <label value="${i18n:_('Stacktracke:')}" />
-                        <textbox id="stacktrace" rows="20" width="600px" />
+                        <textbox id="stacktrace" rows="20" width="600px" readonly="true" />
                     </row>
                 </rows>
             </grid>