Author: solomax
Date: Thu May 31 06:38:05 2012
New Revision: 1344575
URL: http://svn.apache.org/viewvc?rev=1344575&view=rev
Log:
OPENMEETINGS-300 fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Feedbackmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Invitationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/FeedbackTemplate.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/InvitationTemplate.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/RegisterUserTemplate.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/ResetPasswordTemplate.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebServiceFacade.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java?rev=1344575&r1=1344574&r2=1344575&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
Thu May 31 06:38:05 2012
@@ -120,6 +120,15 @@ public class Fieldmanagment {
return null;
}
+ public String getString(Long fieldvalues_id, Long language_id) {
+ String result = null;
+ Fieldlanguagesvalues flv =
getFieldByIdAndLanguage(fieldvalues_id, language_id);
+ if (flv != null) {
+ result = performReplace(flv).getValue();
+ }
+ return result;
+ }
+
public Fieldlanguagesvalues getFieldByIdAndLanguage(Long fieldvalues_id,
Long language_id) {
try {
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=1344575&r1=1344574&r2=1344575&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 May 31 06:38:05 2012
@@ -415,8 +415,7 @@ public class AppointmentLogic {
// Get the required labels one time for all meeting members. The
// Language of the email will be the system default language
- Fieldlanguagesvalues labelid1158 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(1158),
language_id);
+ String labelid1158 = fieldmanagment.getString(1158L,
language_id);
Fieldlanguagesvalues labelid1153 = fieldmanagment
.getFieldByIdAndLanguage(new Long(1153),
language_id);
Fieldlanguagesvalues labelid1154 = fieldmanagment
@@ -497,10 +496,10 @@ public class AppointmentLogic {
}
}
- private String generateSubject(Fieldlanguagesvalues labelid1158,
+ private String generateSubject(String labelid1158,
Appointment ment, TimeZone timezone) {
- String message = labelid1158.getValue() + " "
+ String message = labelid1158 + " "
+ ment.getAppointmentName();
message += ' ' + CalendarPatterns
@@ -527,12 +526,12 @@ public class AppointmentLogic {
* @param labelid1154
* @return
*/
- private String generateMessage(Fieldlanguagesvalues labelid1158,
+ private String generateMessage(String labelid1158,
Appointment ment, Long language_id,
Fieldlanguagesvalues labelid1153, Fieldlanguagesvalues
labelid1154,
TimeZone timezone) {
- String message = labelid1158.getValue() + " "
+ String message = labelid1158 + " "
+ ment.getAppointmentName();
if (ment.getAppointmentDescription().length() != 0) {
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=1344575&r1=1344574&r2=1344575&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
Thu May 31 06:38:05 2012
@@ -29,7 +29,6 @@ import org.openmeetings.app.persistence.
import org.openmeetings.app.persistence.beans.calendar.Appointment;
import org.openmeetings.app.persistence.beans.calendar.MeetingMember;
import org.openmeetings.app.persistence.beans.invitation.Invitations;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
@@ -195,10 +194,7 @@ public class MeetingMemberLogic {
private String formatSubject(Long language_id, Appointment point,
TimeZone timezone) {
try {
- Fieldlanguagesvalues labelid1151 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1151), language_id);
-
- String message = labelid1151.getValue() + " "
+ String message = fieldmanagment.getString(1151L,
language_id) + " "
+ point.getAppointmentName();
message += " "
@@ -220,42 +216,27 @@ public class MeetingMemberLogic {
private String formatMessage(Long language_id, Appointment point,
TimeZone timezone, String invitorName) {
try {
- Fieldlanguagesvalues labelid1151 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1151), language_id);
-
- String message = labelid1151.getValue() + " "
+ String message = fieldmanagment.getString(1151L,
language_id) + " "
+ point.getAppointmentName();
if (point.getAppointmentDescription().length() != 0) {
-
- Fieldlanguagesvalues labelid1152 =
fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1152), language_id);
- message += labelid1152.getValue()
+ message += fieldmanagment.getString(1152L,
language_id)
+
point.getAppointmentDescription();
-
}
- Fieldlanguagesvalues labelid1153 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1153), language_id);
- Fieldlanguagesvalues labelid1154 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1154), language_id);
-
message += "<br/>"
- + labelid1153.getValue()
+ + fieldmanagment.getString(1153L,
language_id)
+ ' '
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
point.getAppointmentStarttime(), timezone)
+ "<br/>";
- message += labelid1154.getValue()
+ message += fieldmanagment.getString(1154L, language_id)
+ ' '
+
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
point.getAppointmentEndtime(), timezone) + "<br/>";
- Fieldlanguagesvalues labelid1156 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1156), language_id);
-
- message += labelid1156.getValue() + invitorName +
"<br/>";
+ message += fieldmanagment.getString(1156L, language_id)
+ invitorName + "<br/>";
return message;
} catch (Exception err) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Feedbackmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Feedbackmanagement.java?rev=1344575&r1=1344574&r2=1344575&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Feedbackmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Feedbackmanagement.java
Thu May 31 06:38:05 2012
@@ -21,7 +21,6 @@ package org.openmeetings.app.data.confer
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.templates.FeedbackTemplate;
import org.openmeetings.utils.mail.MailHandler;
import org.red5.logging.Red5LoggerFactory;
@@ -43,18 +42,13 @@ public class Feedbackmanagement {
public String sendFeedback(String username, String email, String
message) {
try {
- Integer default_lang_id = Integer.valueOf(
- cfgManagement.getConfKey(3,
"default_lang_id")
-
.getConf_value()).intValue();
+ Long default_lang_id =
cfgManagement.getConfValue("default_lang_id", Long.class, "1");
String template =
feedbackTemplate.getFeedBackTemplate(username,
email, message, default_lang_id);
- Fieldlanguagesvalues fValue = fieldmanagment
- .getFieldByIdAndLanguage(new Long(499),
new Long(
- default_lang_id));
return
mailHandler.sendMail("[email protected]",
- fValue.getValue(), template);
+ fieldmanagment.getString(499L,
default_lang_id), template);
} catch (Exception err) {
log.error("sendInvitationLink", err);
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=1344575&r1=1344574&r2=1344575&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 May 31 06:38:05 2012
@@ -280,10 +280,7 @@ public class Invitationmanagement {
private String formatCancelSubject(Long language_id,
Appointment appointment, Users user, TimeZone timezone)
{
try {
- Fieldlanguagesvalues labelid1157 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1157), language_id);
-
- String message = labelid1157.getValue()
+ String message = fieldmanagment.getString(1157L,
language_id)
+ appointment.getAppointmentName();
message += " "
@@ -303,10 +300,7 @@ public class Invitationmanagement {
private String formatCancelMessage(Long language_id,
Appointment appointment, Users user, TimeZone timezone)
{
try {
- Fieldlanguagesvalues labelid1157 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1157), language_id);
-
- String message = labelid1157.getValue()
+ String message = fieldmanagment.getString(1157L,
language_id)
+ appointment.getAppointmentName();
if (appointment.getAppointmentDescription().length() !=
0) {
@@ -420,10 +414,7 @@ public class Invitationmanagement {
Appointment appointment, Users user, TimeZone timezone)
{
try {
- Fieldlanguagesvalues labelid1155 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1155), language_id);
-
- String message = labelid1155.getValue() + " "
+ String message = fieldmanagment.getString(1155L,
language_id) + " "
+ appointment.getAppointmentName();
if (appointment.getAppointmentDescription().length() !=
0) {
@@ -455,10 +446,7 @@ public class Invitationmanagement {
String invitorName) {
try {
- Fieldlanguagesvalues labelid1155 = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(1155), language_id);
-
- String message = labelid1155.getValue() + " "
+ String message = fieldmanagment.getString(1155L,
language_id) + " "
+ appointment.getAppointmentName();
if (appointment.getAppointmentDescription().length() !=
0) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java?rev=1344575&r1=1344574&r2=1344575&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Emailmanagement.java
Thu May 31 06:38:05 2012
@@ -26,7 +26,6 @@ import org.openmeetings.app.Openmeetings
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
import org.openmeetings.app.persistence.beans.adresses.Adresses;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.templates.RegisterUserTemplate;
import org.openmeetings.utils.mail.MailHandler;
import org.red5.logging.Red5LoggerFactory;
@@ -83,20 +82,16 @@ public class Emailmanagement {
.getRegisterUserWithVerificationTemplate(Username,
Userpass,
EMail, default_lang_id,
verification_url);
- Fieldlanguagesvalues label = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(512), default_lang_id);
- succ = mailHandler.sendMail(EMail,
label.getValue(), template);
+ succ = mailHandler.sendMail(EMail,
fieldmanagment.getString(512L, default_lang_id), template);
} else {
String template = registerUserTemplate
.getRegisterUserTemplate(Username, Userpass, EMail,
default_lang_id);
- Fieldlanguagesvalues label = fieldmanagment
- .getFieldByIdAndLanguage(new
Long(512), default_lang_id);
- succ = mailHandler.sendMail(EMail,
label.getValue(), template);
+ succ = mailHandler.sendMail(EMail,
fieldmanagment.getString(512L, default_lang_id), template);
}
return succ;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1344575&r1=1344574&r2=1344575&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
Thu May 31 06:38:05 2012
@@ -51,7 +51,6 @@ import org.openmeetings.app.persistence.
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
-import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.persistence.beans.user.UserSipData;
import org.openmeetings.app.persistence.beans.user.Userdata;
import org.openmeetings.app.persistence.beans.user.Userlevel;
@@ -1521,10 +1520,7 @@ public class Usermanagement {
String template =
resetPasswordTemplate.getResetPasswordTemplate(
reset_link, default_lang_id);
- Fieldlanguagesvalues labelid517 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(517),
default_lang_id);
-
- mailHandler.sendMail(email, labelid517.getValue(), template);
+ mailHandler.sendMail(email, fieldmanagment.getString(517L,
default_lang_id), template);
}
/**
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java?rev=1344575&r1=1344574&r2=1344575&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
Thu May 31 06:38:05 2012
@@ -644,8 +644,6 @@ public class UserService {
.getFieldByIdAndLanguage(1192L,
language_id);
Fieldlanguagesvalues fValue1193 = fieldmanagment
.getFieldByIdAndLanguage(1193L,
language_id);
- Fieldlanguagesvalues fValue1194 = fieldmanagment
- .getFieldByIdAndLanguage(1194L,
language_id);
Fieldlanguagesvalues fValue1190 = fieldmanagment
.getFieldByIdAndLanguage(1190L,
language_id);
Fieldlanguagesvalues fValue1191 = fieldmanagment
@@ -658,7 +656,7 @@ public class UserService {
+ userToAdd.getLastname() +
"<br/><br/>";
message += user.getFirstname() + " " +
user.getLastname() + " "
+ fValue1193.getValue() +
"<br/>";
- message += fValue1194.getValue() + "<br/>";
+ message += fieldmanagment.getString(1194L,
language_id) + "<br/>";
String baseURL = "http://"; + domain + ":" +
port + webapp;
if (port.equals("80")) {
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/FeedbackTemplate.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/FeedbackTemplate.java?rev=1344575&r1=1344574&r2=1344575&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/FeedbackTemplate.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/FeedbackTemplate.java
Thu May 31 06:38:05 2012
@@ -34,15 +34,14 @@ public class FeedbackTemplate extends Ve
FeedbackTemplate.class,
OpenmeetingsVariables.webAppRootKey);
public String getFeedBackTemplate(String username, String email,
- String message, Integer default_lang_id) {
+ String message, long default_lang_id) {
try {
super.init();
// TODO: Finish Feedback - Template
- // Fieldlanguagesvalues fValue =
- // fieldmanagment.getFieldByIdAndLanguage(new
Long(499), new
- // Long(default_lang_id));
+ // String fValue =
+ // fieldmanagment.getString(499L, default_lang_id);
/* lets make a Context and put data into it */
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/InvitationTemplate.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/InvitationTemplate.java?rev=1344575&r1=1344574&r2=1344575&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/InvitationTemplate.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/InvitationTemplate.java
Thu May 31 06:38:05 2012
@@ -49,8 +49,6 @@ public class InvitationTemplate extends
super.init();
- Fieldlanguagesvalues labelid500 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(500),
default_lang_id);
Fieldlanguagesvalues labelid501 = fieldmanagment
.getFieldByIdAndLanguage(new Long(501),
default_lang_id);
Fieldlanguagesvalues labelid502 = fieldmanagment
@@ -76,7 +74,7 @@ public class InvitationTemplate extends
context.put("invitation_link", invitation_link);
context.put("invitation_link2", invitation_link);
- context.put("labelid500", labelid500.getValue());
+ context.put("labelid500",
fieldmanagment.getString(500L, default_lang_id));
context.put("labelid501", labelid501.getValue());
context.put("labelid502", labelid502.getValue());
context.put("labelid503", labelid503.getValue());
@@ -113,8 +111,6 @@ public class InvitationTemplate extends
super.init();
- Fieldlanguagesvalues labelid622 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(622),
default_lang_id);
Fieldlanguagesvalues labelid623 = fieldmanagment
.getFieldByIdAndLanguage(new Long(623),
default_lang_id);
Fieldlanguagesvalues labelid624 = fieldmanagment
@@ -133,7 +129,7 @@ public class InvitationTemplate extends
context.put("message", message);
context.put("invitation_link", invitation_link);
context.put("invitation_link2", invitation_link);
- context.put("labelid500", labelid622.getValue());
+ context.put("labelid500",
fieldmanagment.getString(622L, default_lang_id));
context.put("labelid501", labelid623.getValue());
context.put("labelid502", labelid624.getValue());
context.put("labelid503", labelid625.getValue());
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/RegisterUserTemplate.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/RegisterUserTemplate.java?rev=1344575&r1=1344574&r2=1344575&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/RegisterUserTemplate.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/RegisterUserTemplate.java
Thu May 31 06:38:05 2012
@@ -48,8 +48,6 @@ public class RegisterUserTemplate extend
super.init();
- Fieldlanguagesvalues labelid506 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(506),
default_lang_id);
Fieldlanguagesvalues labelid507 = fieldmanagment
.getFieldByIdAndLanguage(new Long(507),
default_lang_id);
Fieldlanguagesvalues labelid508 = fieldmanagment
@@ -58,9 +56,6 @@ public class RegisterUserTemplate extend
.getFieldByIdAndLanguage(new Long(509),
default_lang_id);
Fieldlanguagesvalues labelid510 = fieldmanagment
.getFieldByIdAndLanguage(new Long(510),
default_lang_id);
- Fieldlanguagesvalues labelid511 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(511),
default_lang_id);
-
Fieldlanguagesvalues labelid667 = fieldmanagment
.getFieldByIdAndLanguage(new Long(667),
default_lang_id);
Fieldlanguagesvalues labelid668 = fieldmanagment
@@ -73,12 +68,12 @@ public class RegisterUserTemplate extend
context.put("userpass", userpass);
context.put("mail", email);
context.put("verification_url", verification_url);
- context.put("labelid506", labelid506.getValue());
+ context.put("labelid506",
fieldmanagment.getString(506L, default_lang_id));
context.put("labelid507", labelid507.getValue());
context.put("labelid508", labelid508.getValue());
context.put("labelid509", labelid509.getValue());
context.put("labelid510", labelid510.getValue());
- context.put("labelid511", labelid511.getValue());
+ context.put("labelid511",
fieldmanagment.getString(511L, default_lang_id));
context.put("labelid667", labelid667.getValue());
context.put("labelid668", labelid668.getValue());
@@ -105,8 +100,6 @@ public class RegisterUserTemplate extend
super.init();
- Fieldlanguagesvalues labelid506 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(506),
default_lang_id);
Fieldlanguagesvalues labelid507 = fieldmanagment
.getFieldByIdAndLanguage(new Long(507),
default_lang_id);
Fieldlanguagesvalues labelid508 = fieldmanagment
@@ -115,8 +108,6 @@ public class RegisterUserTemplate extend
.getFieldByIdAndLanguage(new Long(509),
default_lang_id);
Fieldlanguagesvalues labelid510 = fieldmanagment
.getFieldByIdAndLanguage(new Long(510),
default_lang_id);
- Fieldlanguagesvalues labelid511 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(511),
default_lang_id);
/* lets make a Context and put data into it */
VelocityContext context = new VelocityContext();
@@ -124,12 +115,12 @@ public class RegisterUserTemplate extend
context.put("username", username);
context.put("userpass", userpass);
context.put("mail", email);
- context.put("labelid506", labelid506.getValue());
+ context.put("labelid506",
fieldmanagment.getString(506L, default_lang_id));
context.put("labelid507", labelid507.getValue());
context.put("labelid508", labelid508.getValue());
context.put("labelid509", labelid509.getValue());
context.put("labelid510", labelid510.getValue());
- context.put("labelid511", labelid511.getValue());
+ context.put("labelid511",
fieldmanagment.getString(511L, default_lang_id));
/* lets render a template */
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/ResetPasswordTemplate.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/ResetPasswordTemplate.java?rev=1344575&r1=1344574&r2=1344575&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/ResetPasswordTemplate.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/templates/ResetPasswordTemplate.java
Thu May 31 06:38:05 2012
@@ -45,8 +45,6 @@ public class ResetPasswordTemplate exten
super.init();
- Fieldlanguagesvalues labelid513 = fieldmanagment
- .getFieldByIdAndLanguage(new Long(513),
default_lang_id);
Fieldlanguagesvalues labelid514 = fieldmanagment
.getFieldByIdAndLanguage(new Long(514),
default_lang_id);
Fieldlanguagesvalues labelid515 = fieldmanagment
@@ -58,7 +56,7 @@ public class ResetPasswordTemplate exten
VelocityContext context = new VelocityContext();
context.put("reset_link", reset_link);
context.put("reset_link2", reset_link);
- context.put("labelid513", labelid513.getValue());
+ context.put("labelid513",
fieldmanagment.getString(513L, default_lang_id));
context.put("labelid514", labelid514.getValue());
context.put("labelid515", labelid515.getValue());
context.put("labelid516", labelid516.getValue());
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1344575&r1=1344574&r2=1344575&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebServiceFacade.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebServiceFacade.java
Thu May 31 06:38:05 2012
@@ -51,7 +51,7 @@ public class RoomWebServiceFacade {
try {
ApplicationContext context = WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (RoomWebService)
context.getBean("roomWebService");
+ return context.getBean("roomWebService",
RoomWebService.class);
} catch (Exception err) {
log.error("[getRoomServiceProxy]", err);
}
