take away collaboration from collabsToRemove before role edition

This commit is contained in:
Claudio Barril 2015-04-11 16:09:29 -03:00
parent 2914f5b256
commit 74a05cb7db

View File

@ -412,17 +412,17 @@ public class MindmapController extends BaseController {
throw new IllegalArgumentException(roleStr + " is not a valid role"); throw new IllegalArgumentException(roleStr + " is not a valid role");
} }
// Remove from the list of pendings to remove ...
if (collaboration != null) {
collabsToRemove.remove(collaboration);
}
// Is owner ? // Is owner ?
final CollaborationRole role = CollaborationRole.valueOf(roleStr.toUpperCase()); final CollaborationRole role = CollaborationRole.valueOf(roleStr.toUpperCase());
if (role != CollaborationRole.OWNER) { if (role != CollaborationRole.OWNER) {
mindmapService.addCollaboration(mindMap, restCollab.getEmail(), role, restCollabs.getMessage()); mindmapService.addCollaboration(mindMap, restCollab.getEmail(), role, restCollabs.getMessage());
} }
// Remove from the list of pendings to remove ...
if (collaboration != null) {
collabsToRemove.remove(collaboration);
}
} }
// Remove all collaborations that no applies anymore .. // Remove all collaborations that no applies anymore ..