diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java index e2bd3ee4a..c5ed43c47 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java @@ -38,6 +38,8 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel { private List userOrderAuthorizationList; + private List orderAuthorizationRemovalList; + @Autowired private IOrderAuthorizationDAO dao; @@ -106,6 +108,12 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel { for(OrderAuthorization authorization : userOrderAuthorizationList) { dao.save(authorization); } + for(OrderAuthorization authorization : orderAuthorizationRemovalList) { + try { + dao.remove(authorization.getId()); + } + catch(InstanceNotFoundException e) {} + } } @Override @@ -126,6 +134,8 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel { new ArrayList(); userOrderAuthorizationList = new ArrayList(); + orderAuthorizationRemovalList = + new ArrayList(); if(!order.isNewObject()) { //Retrieve the OrderAuthorizations associated with this order @@ -163,6 +173,9 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel { profileOrderAuthorizationList.remove( (ProfileOrderAuthorization) orderAuthorization); } + if(!orderAuthorization.isNewObject()) { + orderAuthorizationRemovalList.add(orderAuthorization); + } } private ProfileOrderAuthorization createProfileOrderAuthorization( diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul index ec77c2226..486ba97c1 100644 --- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul +++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul @@ -48,7 +48,8 @@