From 704ab10c45d218dbd89005284297688cee356d71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 23 Nov 2009 20:25:41 +0100
Subject: [PATCH] ItEr36S11CUCreacionUnidadesPlanificacionItEr35S12: Fixing
 label name for advanced allocation button and renaming associated controller
 fuction to show better intent

---
 .../web/planner/allocation/ResourceAllocationController.java  | 2 +-
 navalplanner-webapp/src/main/webapp/planner/order.zul         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
index b5b4cd5bc..bf53eb9b0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
@@ -404,7 +404,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
         close();
     }
 
-    public void advanceAllocation() {
+    public void goToAdvancedAllocation() {
         AllocationResult allocationResult = formBinder.getLastAllocation();
         if (allocationResult.getAggregate().isEmpty()) {
             formBinder.doApply();
diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul
index 794c0ec7f..75ff08e6d 100644
--- a/navalplanner-webapp/src/main/webapp/planner/order.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/order.zul
@@ -186,8 +186,8 @@
         <button label="${i18n:_('Apply')}" id="applyButton" />
         <button label="${i18n:_('Cancel')}"
             onClick="allocationController.cancel()" />
-        <button label="${i18n:_('Advance allocation')}"
-            onClick="allocationController.advanceAllocation();" />
+        <button label="${i18n:_('Advanced Allocation')}"
+            onClick="allocationController.goToAdvancedAllocation();" />
     </hbox>
     </window>