diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java index 09f178458..86fe27892 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java @@ -50,14 +50,6 @@ public interface IResourceAllocationModel { */ Task getTask(); - /** - * Removes the {@link ResourceAllocation} from the current {@link Task}. - * - * @param resourceAllocation - * The object to be removed - */ - void removeResourceAllocation(ResourceAllocation resourceAllocation); - /** * Removes {@link SpecificResourceAllocation} from current allocations list * @param data diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java index 6de199975..d4cb9be4e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java @@ -90,11 +90,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel { return found; } - @Override - public void removeResourceAllocation(ResourceAllocation resourceAllocation) { - task.removeResourceAllocation(resourceAllocation); - } - @Override public Set getCriterions() { return (task != null) ? task.getHoursGroup().getCriterions() @@ -113,6 +108,9 @@ public class ResourceAllocationModel implements IResourceAllocationModel { public void removeSpecificResourceAllocation( SpecificAllocationDTO allocation) { currentAllocations.remove(allocation); + if (allocation.isModifying()) { + task.removeResourceAllocation(allocation.getOrigin()); + } } @Override