You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/05/01 06:11:35 UTC
[44/50] [abbrv] openmeetings git commit: [OPENMEETINGS-1401]
invitation is saved as expected, reminders seems to work
[OPENMEETINGS-1401] invitation is saved as expected, reminders seems to work
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/91b6d9c8
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/91b6d9c8
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/91b6d9c8
Branch: refs/heads/3.1.x
Commit: 91b6d9c8328389e6c59e721a9adab3a262e38e6a
Parents: 2c48bef
Author: Maxim Solodovnik <so...@apache.org>
Authored: Wed Jan 25 02:05:19 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Wed Jan 25 02:05:19 2017 +0000
----------------------------------------------------------------------
.../org/apache/openmeetings/db/entity/calendar/Appointment.java | 3 +--
.../apache/openmeetings/db/entity/calendar/MeetingMember.java | 5 +++--
.../test/calendar/TestAppointmentAddAppointment.java | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/91b6d9c8/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
index 17a861e..259da1d 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
@@ -231,7 +231,7 @@ public class Appointment implements IDataProviderEntity {
@Element(data = true, required = false)
private String icalId;
- @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+ @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name = "appointment_id")
private List<MeetingMember> meetingMembers;
@@ -456,5 +456,4 @@ public class Appointment implements IDataProviderEntity {
return "Appointment [id=" + id + ", title=" + title + ", start=" + start + ", end=" + end + ", owner=" + owner
+ ", deleted=" + deleted + ", icalId=" + icalId + "]";
}
-
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/91b6d9c8/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
index fbbda7a..634b931 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/MeetingMember.java
@@ -31,6 +31,7 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
+import javax.persistence.OneToOne;
import javax.persistence.Table;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
@@ -84,8 +85,8 @@ public class MeetingMember implements IDataProviderEntity {
@Element(data = true)
private boolean deleted;
- @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
- @JoinColumn(name = "invitation", nullable = true, insertable = false)
+ @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+ @JoinColumn(name = "invitation_id", nullable = true)
@ForeignKey(enabled = true)
private Invitation invitation;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/91b6d9c8/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
index ac19360..3f29d85 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
@@ -127,6 +127,7 @@ public class TestAppointmentAddAppointment extends AbstractWicketTester {
for (MeetingMember mm : a.getMeetingMembers()) {
assertNotNull("Saved guest should have valid id: ", mm.getId());
assertNotNull("Saved guest should have valid invitation: ", mm.getInvitation());
+ assertNotNull("Saved guest should have invitation with ID: ", mm.getInvitation().getId());
}
WebSession ws = WebSession.get();