From 99c4a499fafcf8640af044c8cee049f4d274357b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 10 Jun 2010 20:23:22 +0200
Subject: [PATCH] ItEr57S04ValidacionEProbasFuncionaisItEr56S04: [Bug #492] Fix
 bug.

The previous controller name was colliding with TemplateController
---
 .../src/main/webapp/templates/_list.zul       |  4 ++--
 .../src/main/webapp/templates/templates.zul   | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/templates/_list.zul b/navalplanner-webapp/src/main/webapp/templates/_list.zul
index b8ed448ba..94cac8883 100644
--- a/navalplanner-webapp/src/main/webapp/templates/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/templates/_list.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <window id="${arg.top_id}" title="${i18n:_('Templates list')}">
-    <grid id="listing" model="@{templateController.templates}" mold="paging"
+    <grid id="listing" model="@{templatesForOrdersController.templates}" mold="paging"
         pageSize="10" fixedLayout="true">
         <columns>
             <column label="${i18n:_('Type')}" sort="auto(type)" />
@@ -45,7 +45,7 @@
                         image="/common/img/ico_editar1.png"
                         hoverImage="/common/img/ico_editar.png"
                         tooltiptext="${i18n:_('Edit')}"
-                        onClick="templateController.goToEditForm(self.parent.parent.value);">
+                        onClick="templatesForOrdersController.goToEditForm(self.parent.parent.value);">
                     </button>
                 </hbox>
             </row>
diff --git a/navalplanner-webapp/src/main/webapp/templates/templates.zul b/navalplanner-webapp/src/main/webapp/templates/templates.zul
index e441aa865..84db0143c 100644
--- a/navalplanner-webapp/src/main/webapp/templates/templates.zul
+++ b/navalplanner-webapp/src/main/webapp/templates/templates.zul
@@ -44,10 +44,10 @@
 
 <zk>
     <zscript><![CDATA[
-        templateController = orderTemplatesController;
+        templatesForOrdersController = orderTemplatesController;
     ]]>
     </zscript>
-    <div self="@{define(content)}" apply="${templateController}">
+    <div self="@{define(content)}" apply="${templatesForOrdersController}">
         <vbox id="messagesContainer" />
         <list top_id="listWindow" />
         <window id="editWindow" title="${i18n:_('Edit template')}">
@@ -55,7 +55,7 @@
             <tabbox>
                 <tabs>
                     <tab id="tabGeneralData" label="${i18n:_('General data')}" />
-                    <tab label="${i18n:_('Template Tree')}" disabled="@{templateController.templateTreeDisabled}"/>
+                    <tab label="${i18n:_('Template Tree')}" disabled="@{templatesForOrdersController.templateTreeDisabled}"/>
                     <tab label="${i18n:_('Advances')}" />
                     <tab label="${i18n:_('Labels')}" />
                     <tab id="tabRequirements" label="${i18n:_('Criterion Requirement')}" />
@@ -74,24 +74,24 @@
                             <rows>
                                 <row>
                                     <label value="${i18n:_('Name')}" />
-                                    <textbox id="name" value="@{templateController.template.name}" width="500px"
-                                        constraint = "@{templateController.validateTemplateName}"/>
+                                    <textbox id="name" value="@{templatesForOrdersController.template.name}" width="500px"
+                                        constraint = "@{templatesForOrdersController.validateTemplateName}"/>
                                 </row>
                                 <row>
                                     <label value="${i18n:_('Code')}" />
                                     <hbox>
-                                        <textbox value="@{templateController.template.code}" width="250px" />
+                                        <textbox value="@{templatesForOrdersController.template.code}" width="250px" />
                                     </hbox>
                                 </row>
                                 <row>
                                     <label value="${i18n:_('Delay from beginning (days)')}" />
                                     <intbox
-                                        value="@{templateController.template.startAsDaysFromBeginning}" constraint="no negative"/>
+                                        value="@{templatesForOrdersController.template.startAsDaysFromBeginning}" constraint="no negative"/>
                                 </row>
                                 <row>
                                     <label value="${i18n:_('Days from Beginning to Deadline')}" />
                                     <intbox
-                                        value="@{templateController.template.deadlineAsDaysFromBeginning}" constraint="no negative"/>
+                                        value="@{templatesForOrdersController.template.deadlineAsDaysFromBeginning}" constraint="no negative"/>
                                 </row>
                             </rows>
                         </grid>
@@ -123,11 +123,11 @@
                 </tabpanels>
             </tabbox>
             <hbox>
-                <button label="${i18n:_('Save')}" onClick="templateController.saveAndExit()"
+                <button label="${i18n:_('Save')}" onClick="templatesForOrdersController.saveAndExit()"
                     sclass="save-button global-action" />
-                <button label="${i18n:_('Save &amp; Continue')}" onClick="templateController.saveAndContinue()"
+                <button label="${i18n:_('Save &amp; Continue')}" onClick="templatesForOrdersController.saveAndContinue()"
                     sclass="saveandcontinue-button global-action" />
-                <button label="${i18n:_('Cancel')}" onClick="templateController.cancel()"
+                <button label="${i18n:_('Cancel')}" onClick="templatesForOrdersController.cancel()"
                     sclass="cancel-button global-action" />
             </hbox>
     </window>