[openmeetings] branch master updated: [OPENMEETINGS-1950] creator is being set while cloning

[so...@apache.org]

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 7c4d57f  [OPENMEETINGS-1950] creator is being set while cloning
7c4d57f is described below

commit 7c4d57f430a4f141039cd2dc6ef6b1d646a950c7
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Oct 23 15:35:13 2018 +0700

    [OPENMEETINGS-1950] creator is being set while cloning
---
 .../org/apache/openmeetings/web/room/poll/PollResultsDialog.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index 482dd7a..4857572 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -19,12 +19,14 @@
 package org.apache.openmeetings.web.room.poll;
 
 import static org.apache.openmeetings.core.util.WebSocketHelper.sendRoom;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.apache.openmeetings.db.dao.room.PollDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.room.RoomPoll;
 import org.apache.openmeetings.db.entity.room.RoomPollAnswer;
 import org.apache.openmeetings.db.util.ws.RoomMessage;
@@ -83,6 +85,8 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
 	private final CreatePollDialog createPoll;
 	@SpringBean
 	private PollDao pollDao;
+	@SpringBean
+	private UserDao userDao;
 
 	public PollResultsDialog(String id, CreatePollDialog createPoll, Long _roomId) {
 		super(id, "");
@@ -204,6 +208,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
 		} else if (moderator && clone.equals(button)) {
 			RoomPoll rp = dispForm.getModelObject();
 			RoomPoll nrp = new RoomPoll();
+			nrp.setCreator(userDao.get(getUserId()));
 			nrp.setName(rp.getName());
 			nrp.setQuestion(rp.getQuestion());
 			nrp.setType(rp.getType());