Author: sebawagner
Date: Sun Apr 29 13:36:42 2012
New Revision: 1331912
URL: http://svn.apache.org/viewvc?rev=1331912&view=rev
Log:
OPENMEETINGS-214 When calendar event invitation is sent, invitation_text_from
value displays with the name of the person for whom the invitation is being
sent to but should be showing the sender's name
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/InvitationService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java?rev=1331912&r1=1331911&r2=1331912&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
Sun Apr 29 13:36:42 2012
@@ -139,7 +139,8 @@ public class MeetingMemberLogic {
true, // really
send mail sendMail
point.getAppointmentStarttime(),
point.getAppointmentEndtime(),
-
point.getAppointmentId());
+
point.getAppointmentId(),
+ invitorName);
invitationId = invitation.getInvitations_id();
@@ -166,7 +167,8 @@ public class MeetingMemberLogic {
meeting_organizer, // created by
point.getAppointmentId(), isInvitor,
language_id,
timezone,
-
point.getAppointmentId());
+
point.getAppointmentId(),
+ invitorName);
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java?rev=1331912&r1=1331911&r2=1331912&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
Sun Apr 29 13:36:42 2012
@@ -123,7 +123,7 @@ public class Invitationmanagement {
Boolean isPasswordProtected, String invitationpass,
Integer valid,
Date validFrom, Date validTo, Long createdBy, String
baseUrl,
Long language_id, Boolean sendMail, Date gmtTimeStart,
- Date gmtTimeEnd, Long appointmentId) {
+ Date gmtTimeEnd, Long appointmentId, String
fromUserField) {
try {
if (authLevelManagement.checkUserLevel(user_level)) {
@@ -189,7 +189,7 @@ public class Invitationmanagement {
this.sendInvitionLink(us.getAdresses().getEmail(),
username,
message, baseurl,
email, subject,
invitation.getHash(),
- validFrom,
validTo, language_id);
+ validFrom,
validTo, language_id, fromUserField);
}
return invitation;
@@ -528,7 +528,7 @@ public class Invitationmanagement {
Boolean isPasswordProtected, String invitationpass,
Integer valid,
Date validFrom, Date validTo, Long createdBy, Long
appointMentId,
Boolean invitor, Long language_id, TimeZone timezone,
- Long appointmentId) {
+ Long appointmentId, String fromUserField) {
log.debug("addInvitationIcalLink");
try {
@@ -586,7 +586,7 @@ public class Invitationmanagement {
this.sendInvitionIcalLink(username,
message, baseurl,
email, subject,
invitation.getHash(),
appointMentId,
createdBy, invitor, language_id,
- validFrom, validTo,
timezone);
+ validFrom, validTo,
timezone, fromUserField);
return invitationId;
}
}
@@ -612,7 +612,7 @@ public class Invitationmanagement {
*/
private String sendInvitionLink(String replyTo, String username, String
message,
String baseurl, String email, String subject,
- String invitationsHash, Date dStart, Date dEnd, Long
language_id) {
+ String invitationsHash, Date dStart, Date dEnd, Long
language_id, String fromUserField) {
try {
String invitation_link = baseurl + "?invitationHash="
@@ -626,7 +626,7 @@ public class Invitationmanagement {
//
getConfKey(3,"default_lang_id").getConf_value()).longValue();
String template =
invitationTemplate.getRegisterInvitationTemplate(
- username, message, invitation_link,
language_id, dStart,
+ fromUserField, message,
invitation_link, language_id, dStart,
dEnd);
return mailHandler.sendMail(email, replyTo, subject,
template);
@@ -845,7 +845,7 @@ public class Invitationmanagement {
String baseurl, String email, String subject,
String invitationsHash, Long appointMentId, Long
organizer_userId,
Boolean invitor, Long language_id, Date starttime, Date
endtime,
- TimeZone timezone) {
+ TimeZone timezone, String fromUserField) {
try {
String invitation_link = baseurl + "?invitationHash="
@@ -858,7 +858,7 @@ public class Invitationmanagement {
// Long default_lang_id = Long.valueOf(cfgManagement.
//
getConfKey(3,"default_lang_id").getConf_value()).longValue();
String template =
invitationTemplate.getRegisterInvitationTemplate(
- username, message, invitation_link,
language_id, starttime,
+ fromUserField, message,
invitation_link, language_id, starttime,
endtime);
IcalHandler handler = new IcalHandler(
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/InvitationService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/InvitationService.java?rev=1331912&r1=1331911&r2=1331912&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/InvitationService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/InvitationService.java
Sun Apr 29 13:36:42 2012
@@ -150,7 +150,7 @@ public class InvitationService implement
email, subject,
room_id, conferencedomain,
isPasswordProtected,
invitationpass, valid, dFrom,
dTo, users_id, baseurl,
language_id, true,
- gmtTimeStart,
gmtTimeEnd, null);
+ gmtTimeStart,
gmtTimeEnd, null, username);
if (invitation != null) {
return "success";
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java?rev=1331912&r1=1331911&r2=1331912&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/JabberWebService.java
Sun Apr 29 13:36:42 2012
@@ -110,7 +110,7 @@ public class JabberWebService {
user_level, username, username, username,
username, username,
room_id, "", Boolean.valueOf(false), null,
Integer.valueOf(3),
null, null, users_id, "", Long.valueOf(1L),
- Boolean.valueOf(false), null, null, null);
+ Boolean.valueOf(false), null, null, null,
username);
return ((invitation == null) ? null : invitation.getHash());
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java?rev=1331912&r1=1331911&r2=1331912&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java
Sun Apr 29 13:36:42 2012
@@ -1676,7 +1676,7 @@ public class RoomWebService {
username,
username, username, room_id, "",
isPasswordProtected, invitationpass, valid,
dFrom, dTo,
users_id, "", 1L, false, dFrom,
- dTo, null);
+ dTo, null,
username);
if (invitation != null) {
@@ -1814,7 +1814,7 @@ public class RoomWebService {
baseurl, email,
subject, room_id, "",
isPasswordProtected, invitationpass, valid,
dFrom, dTo,
users_id, baseurl, language_id,
- sendMail,
dFrom, dTo, null);
+ sendMail,
dFrom, dTo, null, username);
if (invitation != null) {
@@ -1914,7 +1914,7 @@ public class RoomWebService {
baseurl, email,
subject, room_id, "",
isPasswordProtected, invitationpass, valid,
dFrom, dTo,
users_id, baseurl, language_id,
- sendMail,
dFrom, dTo, null);
+ sendMail,
dFrom, dTo, null, username);
if (invitation != null) {
