/
1108_2898_0001-WIP.patch
80 lines (72 loc) · 3.59 KB
/
1108_2898_0001-WIP.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
From bd2fb92b75a8fd1e5a149c461484a6982841e2f2 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 15 Jul 2011 14:05:28 +0200
Subject: [PATCH] WIP
---
.../business/orders/entities/Orders.hbm.xml | 3 +-
.../web/orders/labels/AssignedLabelsModel.java | 25 +++++++++++++++++--
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
index f5a73b8..ae04255 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
@@ -26,8 +26,7 @@
<one-to-many class="org.navalplanner.business.advance.entities.DirectAdvanceAssignment" />
</set>
- <!-- Assess many-to-many bidireccional -->
- <set name="labels" table="order_element_label" cascade="save-update">
+ <set name="labels" table="order_element_label" cascade="none">
<key column="order_element_id" not-null="true"/>
<many-to-many column="label_id" class="org.navalplanner.business.labels.entities.Label"/>
</set>
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsModel.java
index 2392de4..f8812e0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsModel.java
@@ -24,7 +24,10 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.navalplanner.business.common.IAdHocTransactionService;
+import org.navalplanner.business.common.IOnTransaction;
import org.navalplanner.business.labels.daos.ILabelDAO;
+import org.navalplanner.business.labels.daos.ILabelTypeDAO;
import org.navalplanner.business.labels.entities.Label;
import org.navalplanner.business.labels.entities.LabelType;
import org.springframework.beans.factory.annotation.Autowired;
@@ -39,8 +42,14 @@ public abstract class AssignedLabelsModel<T> implements IAssignedLabelsModel<T>
@Autowired
private ILabelDAO labelDAO;
+ @Autowired
+ private ILabelTypeDAO labelTypeDAO;
+
private T element;
+ @Autowired
+ private IAdHocTransactionService adHocTransactionService;
+
@Transactional(readOnly = true)
public void init(T element) {
this.element = element;
@@ -121,9 +130,19 @@ public abstract class AssignedLabelsModel<T> implements IAssignedLabelsModel<T>
return result;
}
- public Label createLabel(String labelName, LabelType labelType) {
- Label label = Label.create(labelName);
- label.setType(labelType);
+ public Label createLabel(final String labelName,
+ final LabelType labelType) {
+ Label label = adHocTransactionService
+ .runOnAnotherTransaction(new IOnTransaction<Label>() {
+ @Override
+ public Label execute() {
+ Label label = Label.create(labelName);
+ label.setType(labelType);
+ labelDAO.save(label);
+ return label;
+ }
+ });
+ label.dontPoseAsTransientObjectAnymore();
addLabelToConversation(label);
return label;
}
--
1.7.6