Removed specific button for creating projects from templates

FEA: ItEr75S04BugFixing

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);
         }
     }
 

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();

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();
 
 }

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);
 }

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<OrderTemplate>() {
-                    @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

libreplan-webapp/src/main/webapp/common/layout/template.zul

@@ -115,15 +115,8 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
     <west class="perspectives-column" width="90px">
         <vbox>
             <hbox id="perspectiveButtonsInsertionPoint" sclass="toolbar-box global-commands" height="30px" width="100%">
-
+                <button id="createOrderButton" image="/common/img/ico_add.png" sclass="planner-icon"
-            <button id="createOrderButton" image="/common/img/ico_add.png" sclass="planner-icon"
+                     tooltiptext="${i18n:_('Create New Project')}" />
-             tooltiptext="${i18n:_('Create New Project')}" />
-
-            <button id="createOrderFromTemplateButton" image="/common/img/ico_copy.png" sclass="planner-icon"
-            tooltiptext="${i18n:_('Create From Template')}" />
-
-            <templateFinderPopup id="templateFinderPopup" acceptButtonLabel="${i18n:_('Create Project')}" caption="${i18n:_('Choosing Template')}" />
-
             </hbox>
             <vbox id="registeredItemsInsertionPoint" width="90px"/>
         </vbox>