From 12742e2a39c517789952cd115b4c0dfad2765d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 14 Oct 2009 01:41:48 +0200
Subject: [PATCH] ItEr30S15RFVisualizacionMultiplesProxectosItEr29S18: Adding
 up button from Order's tree

---
 .../web/orders/OrderCRUDController.java            | 14 ++++++++++++++
 .../tabs/MultipleTabsPlannerController.java        |  6 ++++++
 .../src/main/webapp/orders/_edition.zul            |  1 +
 3 files changed, 21 insertions(+)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index 5d6ab7911..a72fb9a3f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -143,6 +143,14 @@ public class OrderCRUDController extends GenericForwardComposer {
         goToList();
     }
 
+    public void up() {
+        if (onUp == null) {
+            throw new IllegalStateException(
+                    "in order to call up onUp action should have been set");
+        }
+        onUp.run();
+    }
+
     public void confirmRemove(Order order) {
         orderModel.prepareForRemove(order);
         showConfirmingWindow();
@@ -197,6 +205,8 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private boolean confirmingRemove = false;
 
+    private Runnable onUp;
+
     public boolean isConfirmingRemove() {
         return confirmingRemove;
     }
@@ -269,4 +279,8 @@ public class OrderCRUDController extends GenericForwardComposer {
         this.planningControllerEntryPoints = planningControllerEntryPoints;
     }
 
+    public void setActionOnUp(Runnable onUp) {
+        this.onUp = onUp;
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
index f3a46eae1..589e5224f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
@@ -274,6 +274,12 @@ public class MultipleTabsPlannerController implements Composer {
                 getTabsRegistry().show(planningTab);
             }
         });
+        orderCRUDController.setActionOnUp(new Runnable() {
+            public void run() {
+                mode.up();
+                orderCRUDController.goToList();
+            }
+        });
         return orderCRUDController;
     }
 
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index da60a5b9f..befcf8a64 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -20,6 +20,7 @@
 
 <?component name="orderElementTree" inline="true" macroURI="_orderElementTree.zul"?>
 <window id="${arg.top_id}" title="${arg.title}">
+<button label="${i18n:_('Up')}" onClick="controller.up();" />
     <tabbox>
         <tabs>
             <tab label="${i18n:_('General data')}"></tab>