diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java index d203378b0..85a639921 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java @@ -94,8 +94,6 @@ public class LimitingResourcesController extends GenericForwardComposer { private List commands = new ArrayList(); - private org.zkoss.zk.ui.Component parent; - private LimitingResourcesPanel limitingResourcesPanel; private TimeTracker timeTracker; @@ -122,7 +120,6 @@ public class LimitingResourcesController extends GenericForwardComposer { @Override public void doAfterCompose(org.zkoss.zk.ui.Component comp) throws Exception { super.doAfterCompose(comp); - this.parent = comp; } public void reload() { @@ -138,7 +135,7 @@ public class LimitingResourcesController extends GenericForwardComposer { // FIXME: Temporary fix, it seems the page was already rendered, // so // clear it all as it's going to be rendered again - parent.getChildren().clear(); + self.getChildren().clear(); limitingResourceQueueModel.initGlobalView(); @@ -146,7 +143,7 @@ public class LimitingResourcesController extends GenericForwardComposer { timeTracker = buildTimeTracker(); limitingResourcesPanel = buildLimitingResourcesPanel(); - parent.appendChild(limitingResourcesPanel); + self.appendChild(limitingResourcesPanel); limitingResourcesPanel.afterCompose(); cbSelectAll = (Checkbox) limitingResourcesPanel @@ -205,7 +202,7 @@ public class LimitingResourcesController extends GenericForwardComposer { return timeTracker = new TimeTracker(limitingResourceQueueModel .getViewInterval(), ZoomLevel.DETAIL_THREE, SeveralModificators.create(), - SeveralModificators.create(BankHolidaysMarker.create(getDefaultCalendar())),parent); + SeveralModificators.create(BankHolidaysMarker.create(getDefaultCalendar())),self); } private BaseCalendar getDefaultCalendar() { @@ -322,9 +319,6 @@ public class LimitingResourcesController extends GenericForwardComposer { } - public void filterBy(Order order) { - } - public void saveQueues() { limitingResourceQueueModel.confirm(); notifyUserThatSavingIsDone(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java index 39d12a319..571d45b79 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java @@ -27,7 +27,6 @@ import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.ge import java.util.HashMap; import java.util.Map; -import org.navalplanner.business.orders.entities.Order; import org.navalplanner.web.limitingresources.LimitingResourcesController; import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator; import org.zkoss.ganttz.extensions.ITab; @@ -57,6 +56,7 @@ public class LimitingResourcesTabCreator { } private final Mode mode; + private final LimitingResourcesController limitingResourcesController; private final LimitingResourcesController limitingResourcesControllerGlobal; @@ -89,11 +89,8 @@ public class LimitingResourcesTabCreator { public org.zkoss.zk.ui.Component create( org.zkoss.zk.ui.Component parent) { Map arguments = new HashMap(); - // LimitingResourcesController.add(upCommand); arguments.put("LimitingResourcesController", limitingResourcesController); - Order currentOrder = mode.getOrder(); - limitingResourcesController.filterBy(currentOrder); return Executions.createComponents( "/limitingresources/_limitingresources.zul", parent, arguments); @@ -128,7 +125,6 @@ public class LimitingResourcesTabCreator { Map arguments = new HashMap(); arguments.put("LimitingResourcesController", limitingResourcesControllerGlobal); - limitingResourcesControllerGlobal.filterBy(null); return Executions.createComponents( "/limitingresources/_limitingresources.zul", parent, arguments);