Author: solomax
Date: Thu Mar 12 10:00:29 2015
New Revision: 1666115
URL: http://svn.apache.org/r1666115
Log:
[OPENMEETINGS-1187] 'Send One-Time Invitation' function works as expected
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java?rev=1666115&r1=1666114&r2=1666115&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java
Thu Mar 12 10:00:29 2015
@@ -140,7 +140,7 @@ public class InvitationService implement
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- Invitation inv =
(Invitation)invitationManager.getInvitationByHashCode(invitationHash, true);
+ Invitation inv =
(Invitation)invitationManager.getInvitationByHashCode(invitationHash, false);
inv.getInvitee().setLanguage_id(language_id);
invitationManager.sendInvitionLink(inv,
MessageType.Create, subject, message, false);
} else {
@@ -150,8 +150,7 @@ public class InvitationService implement
}
public Object getInvitationByHash(String hashCode) {
- return invitationManager.getInvitationByHashCode(
- hashCode, true);
+ return invitationManager.getInvitationByHashCode(hashCode,
true);
}
public Object checkInvitationPass(String hashCode, String pass) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java?rev=1666115&r1=1666114&r2=1666115&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
Thu Mar 12 10:00:29 2015
@@ -146,7 +146,7 @@ public class InvitationService implement
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- Invitation inv =
(Invitation)invitationManager.getInvitationByHashCode(invitationHash, true);
+ Invitation inv =
(Invitation)invitationManager.getInvitationByHashCode(invitationHash, false);
inv.getInvitee().setLanguageId(language_id);
invitationManager.sendInvitionLink(inv,
MessageType.Create, subject, message, false);
} else {
