Author: solomax Date: Thu Apr 18 15:42:51 2013 New Revision: 1469379 URL: http://svn.apache.org/r1469379 Log: [OPENMEETINGS-481] correct username/email is used while sending invitations
Modified:
openmeetings/branches/2.1/src/org/apache/openmeetings/remote/UserService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
Modified:
openmeetings/branches/2.1/src/org/apache/openmeetings/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/remote/UserService.java?rev=1469379&r1=1469378&r2=1469379&view=diff
==============================================================================
---
openmeetings/branches/2.1/src/org/apache/openmeetings/remote/UserService.java
(original)
+++
openmeetings/branches/2.1/src/org/apache/openmeetings/remote/UserService.java
Thu Apr 18 15:42:51 2013
@@ -1075,22 +1075,21 @@ public class UserService {
// appointment as we created the
// room, the invitations always
belong to the
// appointment of the meeting
creator
- if (to != null
- &&
!to.getUser_id().equals(from.getUser_id())) {
+ if (to != null &&
!to.getUser_id().equals(from.getUser_id())) {
this.addAppointmentToUser(subject, message, to,
recipients, room, appointmentstart,
appointmentend, false, true,
sendJNameTimeZone);
}
+ String username = to == null ?
"" : to.getFirstname() + " " + to.getLastname();;
Invitations invitation =
invitationManager
.addInvitationLink(
new Long(2), // userlevel
-
from.getFirstname() + " "
-
+ from.getLastname(), // username
+
username, // username
message,
baseURL, // baseURl
-
from.getAdresses().getEmail(), // email
+
email, // email
subject, // subject
room_id, // room_id
"public",
@@ -1103,8 +1102,8 @@ public class UserService {
baseURL, from.getUser_id(),
false, // really send mail sendMail
appointmentstart, appointmentend,
-
appointmentId, from.getFirstname()
-
+ " " + from.getLastname(),
+
appointmentId,
+
from.getFirstname() + " " + from.getLastname(),
from.getOmTimeZone());
invitation_link = baseURL +
"?invitationHash="
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1469379&r1=1469378&r2=1469379&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
Thu Apr 18 15:42:51 2013
@@ -1075,22 +1075,21 @@ public class UserService {
// appointment as we created the
// room, the invitations always
belong to the
// appointment of the meeting
creator
- if (to != null
- &&
!to.getUser_id().equals(from.getUser_id())) {
+ if (to != null &&
!to.getUser_id().equals(from.getUser_id())) {
this.addAppointmentToUser(subject, message, to,
recipients, room, appointmentstart,
appointmentend, false, true,
sendJNameTimeZone);
}
+ String username = to == null ?
"" : to.getFirstname() + " " + to.getLastname();;
Invitations invitation =
invitationManager
.addInvitationLink(
new Long(2), // userlevel
-
from.getFirstname() + " "
-
+ from.getLastname(), // username
+
username, // username
message,
baseURL, // baseURl
-
from.getAdresses().getEmail(), // email
+
email, // email
subject, // subject
room_id, // room_id
"public",
@@ -1103,8 +1102,8 @@ public class UserService {
baseURL, from.getUser_id(),
false, // really send mail sendMail
appointmentstart, appointmentend,
-
appointmentId, from.getFirstname()
-
+ " " + from.getLastname(),
+
appointmentId,
+
from.getFirstname() + " " + from.getLastname(),
from.getOmTimeZone());
invitation_link = baseURL +
"?invitationHash="
