Author: vdegtyarev
Date: Fri May 29 12:20:55 2015
New Revision: 1682439
URL: http://svn.apache.org/r1682439
Log:
Merged revision(s) 1682425 from
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java:
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=1682439&r1=1682438&r2=1682439&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
Fri May 29 12:20:55 2015
@@ -115,6 +115,11 @@ public class InvitationService implement
Calendar calFrom = getDate(validFromDate,
validFromTime, iCalTz);
Calendar calTo = getDate(validToDate,
validToTime, iCalTz);
+ User owner = null;
+ if (users_id < 0) {
+ owner = userDao.get(-users_id);
+ }
+ users_id = owner == null ? users_id :
owner.getUser_id();
User invitee = userDao.getContact(email,
firstname, lastname, users_id);
Invitation invitation =
invitationManager.getInvitation(invitee, roomDao.get(room_id),
isPasswordProtected, invitationpass, Valid.fromInt(valid)
