From b5cff2cf3aed8a6349f6cf5effcfae1a0d8dcaa8 Mon Sep 17 00:00:00 2001
From: Diego Pino <dpino@igalia.com>
Date: Sat, 19 May 2012 11:49:05 +0200
Subject: [PATCH] Fix bug: Inclusion of 'GlobalProgress' html code was causing
 a side effect in other views

Include 'GlobalProgress' chart as ZK component instead of using <include>

FEA: ItEr76S15OrganizingPerProjectDashboard
---
 .../src/main/webapp/dashboard/_dashboardfororder.zul           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
index fe56f5e16..9c8131c30 100644
--- a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
+++ b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
@@ -18,6 +18,7 @@
 -->
 
 <?component name="costStatus" inline="true" macroURI="_costStatus.zul"?>
+<?component name="globalProgress" inline="true" macroURI="_globalProgress.zul"?>
 
 <zk xmlns:n="http://www.zkoss.org/2005/zk/native">
 
@@ -120,7 +121,7 @@
         var global_progress = { };
     </script>
 
-    <include src="/dashboard/_globalProgress.zul" />
+    <globalProgress />
 
     <!-- Include jqPlot styles -->
     <n:link class="include" rel="stylesheet" type="text/css" href="/libreplan-webapp/jqplot/jquery.jqplot.min.css" />