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 2016/02/25 08:00:28 UTC
svn commit: r1732253 - in /openmeetings/application:
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/
branches/3.1.x/openmeetings-flash/src/main/swf/base/
trunk/openmeetings-db/src/main/java/org/apache/openmeetings/d...
Author: solomax
Date: Thu Feb 25 07:00:28 2016
New Revision: 1732253
URL: http://svn.apache.org/viewvc?rev=1732253&view=rev
Log:
[OPENMEETINGS-1332] vote creator is able to vote
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java?rev=1732253&r1=1732252&r2=1732253&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java Thu Feb 25 07:00:28 2016
@@ -54,7 +54,7 @@ public class RoomPollAnswer implements I
private Long id;
@OneToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "users_id")
+ @JoinColumn(name = "user_id")
@ForeignKey(enabled = true)
@Element(name="voteduserid", data=false, required=false)
private User votedUser;
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1732253&r1=1732252&r2=1732253&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Thu Feb 25 07:00:28 2016
@@ -378,7 +378,7 @@
ExternalInterface.call("pollResults", canvas.publicSID);
break;
case 'checkPollVoted':
- ExternalInterface.call("vote");
+ ExternalInterface.call("vote", canvas.publicSID);
break;
case 'importFile':
new lz.uploadWindowExplorer(canvas.main_content._content.inner, {x: 60});
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java?rev=1732253&r1=1732252&r2=1732253&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/RoomPollAnswer.java Thu Feb 25 07:00:28 2016
@@ -54,7 +54,7 @@ public class RoomPollAnswer implements I
private Long id;
@OneToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "users_id")
+ @JoinColumn(name = "user_id")
@ForeignKey(enabled = true)
@Element(name="voteduserid", data=false, required=false)
private User votedUser;