ZhouXY108/wisemapping-open-source
1
1
Fork 0
mirror of https://github.com/wisemapping/wisemapping-open-source.git synced 2025-04-05 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

take away collaboration from collabsToRemove before role edition

Browse Source
This commit is contained in:
Claudio Barril 2015-04-11 16:09:29 -03:00
parent 928ef3d813
commit 3ad7a345cc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
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 ..