diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java b/wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java index e04209ce..82dc8c5e 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/LabelController.java @@ -76,9 +76,10 @@ public class LabelController extends BaseController { return new RestLabelList(all); } - @RequestMapping(method = RequestMethod.PUT, value = "/labels/{id}/maps", consumes = {"text/plain"}) + @RequestMapping(method = RequestMethod.PUT, value = "/labels/maps", consumes = {"application/json"}) @ResponseStatus(value = HttpStatus.NO_CONTENT) - public void linkToMindMaps(@PathVariable int id, @RequestBody String ids) throws WiseMappingException { + public void linkToMindMaps(@RequestBody RestLabel restLabel, @RequestParam(required = true) String ids) throws WiseMappingException { + int id = restLabel.getId(); final Label label = labelService.getLabelById(id); if (label == null) { throw new LabelCouldNotFoundException("Label could not be found. Id: " + id); diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java index d1dad7ce..2566d2f8 100644 --- a/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java +++ b/wise-webapp/src/main/java/com/wisemapping/rest/model/RestMindmapInfo.java @@ -21,6 +21,7 @@ package com.wisemapping.rest.model; import com.wisemapping.model.Collaboration; import com.wisemapping.model.Collaborator; +import com.wisemapping.model.Label; import com.wisemapping.model.Mindmap; import com.wisemapping.model.User; import com.wisemapping.security.Utils; @@ -35,6 +36,8 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; import java.util.Calendar; +import java.util.HashSet; +import java.util.Set; @XmlRootElement(name = "map") @XmlAccessorType(XmlAccessType.PROPERTY) @@ -93,6 +96,13 @@ public class RestMindmapInfo { public void setTitle(String title) { mindmap.setTitle(title); } + public Set getLabels() { + final Set result = new HashSet<>(); + for (Label label : mindmap.getLabels()) { + result.add(new RestLabel(label)); + } + return result; + } public int getId() { return mindmap.getId(); diff --git a/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml b/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml index 4033a575..e0f69a27 100644 --- a/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml +++ b/wise-webapp/src/main/resources/com/wisemapping/model/Mindmap.hbm.xml @@ -28,7 +28,7 @@ + cascade="all">