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/11 11:42:33 UTC
svn commit: r1729797 - in /openmeetings/application:
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/
branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/
trunk/openmeetings-db/src/main/java/org/apache/openmee...
Author: solomax
Date: Thu Feb 11 10:42:33 2016
New Revision: 1729797
URL: http://svn.apache.org/viewvc?rev=1729797&view=rev
Log:
[OPENMEETINGS-1332] multiple typos related to polls were fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1729797&r1=1729796&r2=1729797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Thu Feb 11 10:42:33 2016
@@ -137,12 +137,12 @@ public class PollDao {
return false;
}
- public boolean hasVoted(Long roomId, Long userid) {
+ public boolean hasVoted(Long roomId, Long userId) {
try {
- log.debug(" :: hasVoted :: " + roomId + ", " + userid);
+ log.debug(" :: hasVoted :: " + roomId + ", " + userId);
TypedQuery<RoomPollAnswer> q = em.createNamedQuery("hasVoted", RoomPollAnswer.class);
q.setParameter("roomId", roomId);
- q.setParameter("userid", userid);
+ q.setParameter("userId", userId);
q.getSingleResult();
return true;
} catch (NoResultException nre) {
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx?rev=1729797&r1=1729796&r2=1729797&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/hibernate/hibRtmpConnection.lzx Thu Feb 11 10:42:33 2016
@@ -1388,7 +1388,7 @@
<![CDATA[
//The onResult-Handler will be called by the rtmpconnection
if ($debug) Debug.write("newPoll : ", value);
- if (canvas.userId != value.createdBy.id) {
+ if (canvas.userId != value.creator.id) {
ExternalInterface.call("vote", canvas.publicSID);
}
]]>
Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1729797&r1=1729796&r2=1729797&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java (original)
+++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Thu Feb 11 10:42:33 2016
@@ -137,12 +137,12 @@ public class PollDao {
return false;
}
- public boolean hasVoted(Long roomId, Long userid) {
+ public boolean hasVoted(Long roomId, Long userId) {
try {
- log.debug(" :: hasVoted :: " + roomId + ", " + userid);
+ log.debug(" :: hasVoted :: " + roomId + ", " + userId);
TypedQuery<RoomPollAnswer> q = em.createNamedQuery("hasVoted", RoomPollAnswer.class);
q.setParameter("roomId", roomId);
- q.setParameter("userid", userid);
+ q.setParameter("userId", userId);
q.getSingleResult();
return true;
} catch (NoResultException nre) {