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

Merge branch 'develop' into feature/lock2

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2022-03-22 22:09:00 -03:00
parent cbdd6ebb47 0ee642c246
commit 63f83e879d
4 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
View File

@@ -244,7 +244,7 @@ public class MindmapController extends BaseController {
@RequestMapping(method = RequestMethod.POST, value = "/maps/{id}/collabs/", consumes = {"application/json", "application/xml"}, produces = {"application/json", "application/xml"})
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateCollabs(@PathVariable int id, @NotNull @RequestBody RestCollaborationList restCollabs) throws CollaborationException, MapCouldNotFoundException, AccessDeniedSecurityException {
public void updateCollabs(@PathVariable int id, @NotNull @RequestBody RestCollaborationList restCollabs) throws CollaborationException, MapCouldNotFoundException, AccessDeniedSecurityException, InvalidEmailException {
final Mindmap mindMap = findMindmapById(id);
// Only owner can change collaborators...
@@ -260,7 +260,7 @@ public class MindmapController extends BaseController {
// Is a valid email address ?
if (!EmailValidator.getInstance().isValid(email)) {
throw new IllegalArgumentException(email + " is not valid email address");
throw new InvalidEmailException(email);
}
final Collaboration collaboration = mindMap.findCollaboration(email);
@@ -270,7 +270,7 @@ public class MindmapController extends BaseController {
throw new IllegalArgumentException(roleStr + " is not a valid role");
}
// Remove from the list of pendings to remove ...
// Remove from the list of pending to remove ...
if (collaboration != null) {
collabsToRemove.remove(collaboration);
}
@@ -408,7 +408,7 @@ public class MindmapController extends BaseController {
// Is a valid email address ?
final EmailValidator emailValidator = EmailValidator.getInstance();
if (!emailValidator.isValid(email)) {
throw new IllegalArgumentException(email + " is not valid email address");
throw new InvalidEmailException(email);
}
final Mindmap mindmap = findMindmapById(id);