From 5751692b9c259f1b466e255b115e8ff729b6ddc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Wed, 26 Oct 2011 11:31:47 +0200 Subject: [PATCH] Removed access to ResourcesLoad and AdvancedAllocation from company view context menu This patch should be reverted if the Save and Cancel commands are properly refactored and can be called from a single point to add the buttons on those perspectives, if the user has not passed throug order gantt and the state is explicitly set. FEA: ItEr75S04BugFixing --- .../web/planner/tabs/PlanningTabCreator.java | 69 +------------------ 1 file changed, 3 insertions(+), 66 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java index 33c4faa64..c287bae64 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java @@ -113,10 +113,9 @@ public class PlanningTabCreator { commands.add(scheduleCommand); ICommandOnTask orderDetailsCommand = buildOrderDetailsCommand(); commands.add(orderDetailsCommand); - ICommandOnTask resourcesLoadCommand = buildResourcesLoadCommand(); - commands.add(resourcesLoadCommand); - ICommandOnTask advancedAllocationCommand = buildAdvancedAllocationCommand(); - commands.add(advancedAllocationCommand); + + // TODO: Revert removal of ResourcesLoad and AdvancedAllocation + // context entries when save and cancel commands are refactored companyPlanningController.setAdditional(commands); companyPlanningController.setTabsController(tabsController); @@ -193,68 +192,6 @@ public class PlanningTabCreator { }; } - private ICommandOnTask buildResourcesLoadCommand() { - return new ICommandOnTask() { - - @Override - public void doAction( - IContextWithPlannerTask context, - TaskElement task) { - OrderElement orderElement = task.getOrderElement(); - if (orderElement instanceof Order) { - Order order = (Order) orderElement; - tabsController.goToResourcesLoad(order); - } - } - - @Override - public String getName() { - return _("Resources Load"); - } - - @Override - public String getIcon() { - return "/common/img/ico_menu_order-load.png"; - } - - @Override - public boolean isApplicableTo(TaskElement task) { - return true; - } - }; - } - - private ICommandOnTask buildAdvancedAllocationCommand() { - return new ICommandOnTask() { - - @Override - public void doAction( - IContextWithPlannerTask context, - TaskElement task) { - OrderElement orderElement = task.getOrderElement(); - if (orderElement instanceof Order) { - Order order = (Order) orderElement; - tabsController.goToAdvancedAllocation(order); - } - } - - @Override - public String getName() { - return _("Advanced Allocation"); - } - - @Override - public String getIcon() { - return "/common/img/ico_menu_advanced-assignment.png"; - } - - @Override - public boolean isApplicableTo(TaskElement task) { - return true; - } - }; - } - }; return new CreatedOnDemandTab(_("Projects Planning"), "company-scheduling",