This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push: new 2ab8d3f [OPENMEETINGS-2714] invitation is saved as expected 2ab8d3f is described below commit 2ab8d3f23e569322207520451bf535b72982a302 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Fri Nov 26 23:13:05 2021 +0700 [OPENMEETINGS-2714] invitation is saved as expected --- .../java/org/apache/openmeetings/db/dao/room/InvitationDao.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java index b1a76c9..e48fe34 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/InvitationDao.java @@ -38,8 +38,10 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import org.apache.openmeetings.db.dao.IDataProviderDao; +import org.apache.openmeetings.db.entity.record.Recording; import org.apache.openmeetings.db.entity.room.Invitation; import org.apache.openmeetings.db.entity.room.Invitation.Valid; +import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.util.CalendarHelper; import org.apache.wicket.util.string.Strings; @@ -120,6 +122,12 @@ public class InvitationDao implements IDataProviderDao<Invitation> { public Invitation update(Invitation invitation) { // [OPENMEETINGS-2441] in life cycle state unmanaged while cascading persistence via field invitation.setInvitedBy(em.find(User.class, invitation.getInvitedBy().getId())); + if (invitation.getRoom() != null) { + invitation.setRoom(em.find(Room.class, invitation.getRoom().getId())); + } + if (invitation.getRecording() != null) { + invitation.setRecording(em.find(Recording.class, invitation.getRecording().getId())); + } if (invitation.getId() == null) { em.persist(invitation); } else {