From 1b7f5a8fcd5301677c034b3afe67ec76dd4be889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Fri, 4 Nov 2011 20:19:56 +0100 Subject: [PATCH] Removed specific button for creating projects from templates FEA: ItEr75S04BugFixing --- .../web/orders/OrderCRUDController.java | 7 ----- .../planner/company/CompanyPlanningModel.java | 4 --- .../company/ICompanyPlanningModel.java | 2 -- .../planner/tabs/IGlobalViewEntryPoints.java | 2 -- .../tabs/MultipleTabsPlannerController.java | 28 ------------------- .../main/webapp/common/layout/template.zul | 11 ++------ 6 files changed, 2 insertions(+), 52 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java index 856fc3d68..000382f69 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java @@ -53,8 +53,6 @@ import org.libreplan.web.common.Util; import org.libreplan.web.common.components.bandboxsearch.BandboxMultipleSearch; import org.libreplan.web.common.components.bandboxsearch.BandboxSearch; import org.libreplan.web.common.components.finders.FilterPair; -import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup; -import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup.IOnResult; import org.libreplan.web.orders.criterionrequirements.AssignedCriterionRequirementToOrderElementController; import org.libreplan.web.orders.labels.AssignedLabelsToOrderElementController; import org.libreplan.web.orders.labels.LabelsAssignmentToOrderElementComponent; @@ -194,7 +192,6 @@ public class OrderCRUDController extends GenericForwardComposer { private Vbox orderElementFilter; private Button createOrderButton; - private Button createOrderFromTemplateButton; private Button saveOrderAndContinueButton; private Button cancelEditionButton; @@ -1394,9 +1391,6 @@ public class OrderCRUDController extends GenericForwardComposer { if (createOrderButton != null) { createOrderButton.setVisible(showCreate); } - if (createOrderFromTemplateButton != null) { - createOrderFromTemplateButton.setVisible(showCreate); - } if (saveOrderAndContinueButton != null) { saveOrderAndContinueButton.setVisible(!showCreate); } @@ -1439,7 +1433,6 @@ public class OrderCRUDController extends GenericForwardComposer { private void checkCreationPermissions() { if (!SecurityUtils.isUserInRole(UserRole.ROLE_CREATE_ORDER)) { createOrderButton.setDisabled(true); - createOrderFromTemplateButton.setDisabled(true); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java index 7edd60ba4..f9f5999cc 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java @@ -872,10 +872,6 @@ public class CompanyPlanningModel implements ICompanyPlanningModel { } } - public void goToCreateOtherOrderFromTemplate(OrderTemplate template) { - tabs.goToCreateotherOrderFromTemplate(template); - } - @Transactional(readOnly=true) public ProgressType getProgressTypeFromConfiguration() { return configurationDAO.getConfiguration().getProgressType(); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java index c438434da..7dc0bf24b 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/ICompanyPlanningModel.java @@ -49,8 +49,6 @@ public interface ICompanyPlanningModel { LocalDate getFilterFinishDate(); - void goToCreateOtherOrderFromTemplate(OrderTemplate template); - ProgressType getProgressTypeFromConfiguration(); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java index fc7a9662b..964387c35 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/IGlobalViewEntryPoints.java @@ -65,6 +65,4 @@ public interface IGlobalViewEntryPoints { @EntryPoint("order_advanced_allocation") void goToAdvancedAllocation(Order order); - @EntryPoint("create_order_from_template") - void goToCreateotherOrderFromTemplate(OrderTemplate template); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java index 290269bb1..4f6733851 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/tabs/MultipleTabsPlannerController.java @@ -384,16 +384,6 @@ public class MultipleTabsPlannerController implements Composer, } }); - final Button createOrderFromTemplateButton = (Button) comp - .getPage() - .getFellow("createOrderFromTemplateButton"); - createOrderFromTemplateButton.addEventListener(Events.ON_CLICK, - new EventListener() { - @Override - public void onEvent(Event event) throws Exception { - goToCreateOrderFromTemplate(createOrderFromTemplateButton); - } - }); } } @@ -429,18 +419,6 @@ public class MultipleTabsPlannerController implements Composer, } - public void goToCreateOrderFromTemplate(org.zkoss.zk.ui.Component button) { - TemplateFinderPopup templateFinderPopup = (TemplateFinderPopup) button - .getPage().getFellow("templateFinderPopup"); - templateFinderPopup.openForOrderCreation(button, "after_start", - new IOnResult() { - @Override - public void found(OrderTemplate template) { - goToCreateotherOrderFromTemplate(template); - } - }); - } - @Override public void goToOrder(Order order) { planningTab.toggleToNoFeedback(); @@ -474,12 +452,6 @@ public class MultipleTabsPlannerController implements Composer, getTabsRegistry().show(advancedAllocationTab, changeModeTo(order)); } - @Override - public void goToCreateotherOrderFromTemplate(OrderTemplate template) { - getTabsRegistry().show(ordersTab); - orderCRUDController.showCreateFormFromTemplate(template); - } - private IBeforeShowAction changeModeTo(final Order order) { return new IBeforeShowAction() { @Override diff --git a/libreplan-webapp/src/main/webapp/common/layout/template.zul b/libreplan-webapp/src/main/webapp/common/layout/template.zul index c0a4358da..e737e91c2 100644 --- a/libreplan-webapp/src/main/webapp/common/layout/template.zul +++ b/libreplan-webapp/src/main/webapp/common/layout/template.zul @@ -115,15 +115,8 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?> - -