Author: solomax
Date: Thu Jul 19 06:00:55 2012
New Revision: 1363225
URL: http://svn.apache.org/viewvc?rev=1363225&view=rev
Log:
OPENMEETINGS-267 fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java?rev=1363225&r1=1363224&r2=1363225&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Thu Jul 19 06:00:55 2012
@@ -422,9 +422,9 @@ public class AppointmentLogic {
// Language of the email will be the system default language
String labelid1158 = fieldmanagment.getString(1158L,
language_id);
Fieldlanguagesvalues labelid1153 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(1153),
language_id);
+ .getFieldByIdAndLanguage(1153L, language_id);
Fieldlanguagesvalues labelid1154 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(1154),
language_id);
+ .getFieldByIdAndLanguage(1154L, language_id);
for (int i = 0; i < points.size(); i++) {
Appointment ment = points.get(i);
@@ -490,7 +490,7 @@ public class AppointmentLogic {
String message =
generateMessage(labelid1158, ment,
language_id,
labelid1153, labelid1154, tZone);
-
invitationManagement.sendInvitationReminderLink(message,
+
invitationManagement.sendInvitationReminderLink(language_id, message,
inv.getBaseUrl(),
mm.getEmail(), subject,
inv.getHash());
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=1363225&r1=1363224&r2=1363225&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
Thu Jul 19 06:00:55 2012
@@ -462,9 +462,9 @@ public class Invitationmanagement {
}
Fieldlanguagesvalues labelid1153 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1153), language_id);
+ .getFieldByIdAndLanguage(1153L,
language_id);
Fieldlanguagesvalues labelid1154 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1154), language_id);
+ .getFieldByIdAndLanguage(1154L,
language_id);
message += "<br/>"
+ labelid1153.getValue()
@@ -638,7 +638,7 @@ public class Invitationmanagement {
* @return
*/
//
----------------------------------------------------------------------------------------------------
- public String sendInvitationReminderLink(String message, String baseUrl,
+ public String sendInvitationReminderLink(long langId, String message,
String baseUrl,
String email, String subject, String invitationHash) {
log.debug("sendInvitationReminderLink");
@@ -646,11 +646,9 @@ public class Invitationmanagement {
String invitation_link = baseUrl + "?invitationHash="
+ invitationHash;
- message += "<br/>";
- message += "<a href='" + invitation_link
- + "'>Click here to enter room</a>";
-
- return mailHandler.sendMail(email, subject, message);
+ return mailHandler.sendMail(email, subject
+ , message + "<br/><a href='" +
invitation_link + "'>"
+ +
fieldmanagment.getFieldByIdAndLanguage(626L, langId) + "</a>");
} catch (Exception e) {
log.error("sendInvitationReminderLink", e);
}
