diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java
index 3353485f5..88119e821 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingResourceAllocationController.java
@@ -36,6 +36,7 @@ import org.navalplanner.web.planner.allocation.TaskInformation;
import org.navalplanner.web.planner.allocation.TaskInformation.ITotalHoursCalculationListener;
import org.navalplanner.web.planner.order.PlanningState;
import org.navalplanner.web.planner.taskedition.EditTaskController;
+import org.navalplanner.web.planner.taskedition.TaskPropertiesController.ResourceAllocationTypeEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
@@ -148,18 +149,18 @@ public class LimitingResourceAllocationController extends GenericForwardComposer
return resourceAllocationModel.getResourceAllocationRows();
}
- public void onSelectWorkers(AllocationSelector allocationSelector) {
+ public void selectWorkers(AllocationSelector allocationSelector) {
try {
allocationSelector.addChoosen();
} finally {
- tabLimitingResourceAllocation.setSelected(true);
- allocationSelector.clearAll();
+ closeSelectWorkers();
Util.reloadBindings(gridLimitingAllocations);
}
}
- public void onCloseSelectWorkers() {
+ public void closeSelectWorkers() {
clear();
+ tabLimitingResourceAllocation.setSelected(true);
}
public void clear() {
diff --git a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul
index fdcaf9c49..10f24860d 100644
--- a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelLimitingResourceAllocation.zul
@@ -56,7 +56,7 @@
-
+
@@ -81,8 +81,8 @@
-
-
+
+