LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[UPDATE] 

- adds json annotation '@JsonIdentityInfo' to many-to-many relationships of exportable classes

git-svn-id: https://svn.libreccm.org/ccm/trunk@4498 8810af33-2d31-482b-a856-94f89814c4df
master
tosmers 2016-12-20 22:52:01 +00:00
parent 916b622a36
commit 52e45ed151
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ccm-core/src/com/arsdigita/portation/conversion/core/workflow/AssignableTaskConversion.java
View File

@ -77,14 +77,18 @@ public class AssignableTaskConversion {
AssignableTask assignableTask = new AssignableTask(trunkUserTask); AssignableTask assignableTask = new AssignableTask(trunkUserTask);
// set workflow and opposed associations // set workflow and opposed associations
if (trunkUserTask.getWorkflow() != null) { com.arsdigita.workflow.simple.Workflow userTaskWorkflow = null;
Workflow workflow = NgCollection.workflows.get( try {
trunkUserTask.getWorkflow().getID().longValue()); userTaskWorkflow = trunkUserTask.getWorkflow();
if (workflow != null) { if (userTaskWorkflow != null) {
assignableTask.setWorkflow(workflow); Workflow workflow = NgCollection.workflows.get(
workflow.addTask(assignableTask); userTaskWorkflow.getID().longValue());
if (workflow != null) {
assignableTask.setWorkflow(workflow);
workflow.addTask(assignableTask);
}
} }
} } catch (Exception e) {}
// set taskComments // set taskComments
Iterator commentsIt = trunkUserTask.getComments(); Iterator commentsIt = trunkUserTask.getComments();

11
ccm-core/src/com/arsdigita/portation/modules/core/workflow/Task.java
View File

@ -22,7 +22,8 @@ import com.arsdigita.portation.conversion.NgCollection;
import com.arsdigita.portation.modules.core.l10n.LocalizedString; import com.arsdigita.portation.modules.core.l10n.LocalizedString;
import com.arsdigita.portation.modules.core.workflow.util.StateMapper; import com.arsdigita.portation.modules.core.workflow.util.StateMapper;
import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonManagedReference; import com.fasterxml.jackson.annotation.JsonIdentityInfo;
import com.fasterxml.jackson.annotation.ObjectIdGenerators;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -47,9 +48,13 @@ public class Task {
@JsonBackReference @JsonBackReference
private Workflow workflow; private Workflow workflow;
@JsonManagedReference @JsonIdentityInfo(
generator = ObjectIdGenerators.PropertyGenerator.class,
property = "taskId")
private List<Task> dependentTasks; private List<Task> dependentTasks;
@JsonBackReference @JsonIdentityInfo(
generator = ObjectIdGenerators.PropertyGenerator.class,
property = "taskId")
private List<Task> dependsOn; private List<Task> dependsOn;
private List<TaskComment> comments; private List<TaskComment> comments;