mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-22 06:07:57 +01:00
take away collaboration from collabsToRemove before role edition
This commit is contained in:
parent
2914f5b256
commit
74a05cb7db
@ -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 ..
|
||||||
|
Loading…
Reference in New Issue
Block a user