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 9400e9919..d692f5228 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 @@ -307,6 +307,10 @@ public class OrderCRUDController extends GenericForwardComposer { private Runnable onUp; public void goToEditForm(Order order) { + planningControllerEntryPoints.goToOrderDetails(order); + } + + public void initEdit(Order order) { orderModel.initEdit(order); showEditWindow(_("Edit order")); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningGate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningGate.java index bb236de70..f4ff80aef 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningGate.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/IOrderPlanningGate.java @@ -23,10 +23,15 @@ package org.navalplanner.web.planner.order; import org.navalplanner.business.orders.entities.Order; /** - * This interface allows to go to the schedule of an {@link Order} + * This interface allows to go to the schedule and the details of an + * {@link Order}. + * * @author Óscar González Fernández */ public interface IOrderPlanningGate { - public void goToScheduleOf(Order order); + void goToScheduleOf(Order order); + + void goToOrderDetails(Order order); + } 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 259ec6f2e..6eaa2f04d 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 @@ -127,6 +127,13 @@ public class MultipleTabsPlannerController implements Composer, mode.goToOrderMode(order); getTabsRegistry().show(planningTab); } + + @Override + public void goToOrderDetails(Order order) { + mode.goToOrderMode(order); + getTabsRegistry().show(ordersTab); + } + }); final State typeChanged = typeChangedState(); ITab advancedAllocation = AdvancedAllocationTabCreator.create(mode, diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java index 15a0af08a..14ffa0d6a 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java @@ -133,7 +133,7 @@ public class OrdersTabCreator { breadcrumbs.appendChild(new Label(ORDER_ORDERS_VIEW)); breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR)); if (mode.isOf(ModeType.ORDER)) { - orderCRUDController.goToEditForm(mode.getOrder()); + orderCRUDController.initEdit(mode.getOrder()); breadcrumbs .appendChild(new Label(mode.getOrder().getName())); }