From a4230502f5ede55118d90d08a900a9deb7dafc11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Sun, 10 Jan 2010 18:01:42 +0100 Subject: [PATCH] ItEr42S17CUGravacionModelosUnidadesTraballoItEr41S20: Adding create template link from order's listing. --- .../navalplanner/web/orders/OrderCRUDController.java | 10 ++++++++++ navalplanner-webapp/src/main/webapp/orders/_list.zul | 6 ++++++ 2 files changed, 16 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 b5c27c9e5..c3c3e7a55 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 @@ -27,6 +27,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Resource; + import org.apache.commons.logging.LogFactory; import org.hibernate.validator.InvalidValue; import org.navalplanner.business.calendars.entities.BaseCalendar; @@ -44,6 +46,7 @@ import org.navalplanner.web.common.Util; import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController; import org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent; import org.navalplanner.web.planner.order.IOrderPlanningGate; +import org.navalplanner.web.templates.IOrderTemplatesControllerEntryPoints; import org.navalplanner.web.tree.TreeComponent; import org.navalplanner.web.users.OrderAuthorizationController; import org.springframework.beans.factory.annotation.Autowired; @@ -114,6 +117,9 @@ public class OrderCRUDController extends GenericForwardComposer { private Component messagesContainer; + @Resource + private IOrderTemplatesControllerEntryPoints orderTemplates; + private Window editWindow; private Window listWindow; @@ -394,6 +400,10 @@ public class OrderCRUDController extends GenericForwardComposer { } } + public void createTemplate(Order order) { + orderTemplates.goToCreateTemplateFrom(order); + } + private Runnable onUp; public void goToEditForm(Order order) { diff --git a/navalplanner-webapp/src/main/webapp/orders/_list.zul b/navalplanner-webapp/src/main/webapp/orders/_list.zul index 1a0ec54c1..b05deecea 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_list.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_list.zul @@ -63,6 +63,12 @@ hoverImage="/common/img/ico_planificador.png" tooltiptext="${i18n:_('See scheduling')}" onClick="controller.schedule(self.parent.parent.value);" /> + +