zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged WISE-436-fixErrorChangingRoleInSharing into develop

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2015-04-12 16:11:36 -03:00
parent 9caa90db63 d73ee3b902
commit e7ce96fd30
3 changed files with 12 additions and 6 deletions
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");
}
// Remove from the list of pendings to remove ...
if (collaboration != null) {
collabsToRemove.remove(collaboration);
}
// Is owner ?
final CollaborationRole role = CollaborationRole.valueOf(roleStr.toUpperCase());
if (role != CollaborationRole.OWNER) {
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 ..