Author: vdegtyarev
Date: Mon Jun 1 05:26:05 2015
New Revision: 1682818
URL: http://svn.apache.org/r1682818
Log:
Merge to trunk - OPENMEETINGS-1213 Minor changes. Invitation works as expected
for contacts.
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/InvitationService.java
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=1682818&r1=1682817&r2=1682818&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
Mon Jun 1 05:26:05 2015
@@ -119,7 +119,7 @@ public class InvitationService implement
if (users_id < 0) {
owner = userDao.get(-users_id);
}
- users_id = owner == null ? users_id :
owner.getUser_id();
+ users_id = owner == null ? users_id :
owner.getOwnerId();
User invitee = userDao.getContact(email,
firstname, lastname, users_id);
Invitation invitation =
invitationManager.getInvitation(invitee, roomDao.get(room_id),
isPasswordProtected, invitationpass, Valid.fromInt(valid)
