Author: solomax
Date: Tue Jan 27 10:42:35 2015
New Revision: 1655003
URL: http://svn.apache.org/r1655003
Log:
[OPENMEETINGS-1130] tags in the description are displayed as expected
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java?rev=1655003&r1=1655002&r2=1655003&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
Tue Jan 27 10:42:35 2015
@@ -37,7 +37,7 @@ public class CreatedAppointmentTemplate
add(new Label("title", a.getTitle()));
add(new WebMarkupContainer("descContainer")
.add(new Label("descLbl", WebSession.getString(1152L,
langId)))
- .add(new Label("desc", a.getDescription()))
+ .add(new Label("desc",
a.getDescription()).setEscapeModelStrings(false))
.setVisible(!Strings.isEmpty(a.getDescription()))
);
add(new Label("startLbl", WebSession.getString(1153L, langId)));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java?rev=1655003&r1=1655002&r2=1655003&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
Tue Jan 27 10:42:35 2015
@@ -36,7 +36,7 @@ public class CanceledAppointmentTemplate
add(new Label("title", a.getTitle()));
add(new WebMarkupContainer("descContainer")
.add(new Label("descLbl", getString(1152L, langId)))
- .add(new Label("desc", a.getDescription()))
+ .add(new Label("desc",
a.getDescription()).setEscapeModelStrings(false))
.setVisible(!Strings.isEmpty(a.getDescription()))
);
add(new Label("startLbl", getString(1153L, langId)));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java?rev=1655003&r1=1655002&r2=1655003&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
Tue Jan 27 10:42:35 2015
@@ -36,7 +36,7 @@ public class CreatedAppointmentTemplate
add(new Label("title", a.getTitle()));
add(new WebMarkupContainer("descContainer")
.add(new Label("descLbl", getString(1152L, langId)))
- .add(new Label("desc", a.getDescription()))
+ .add(new Label("desc",
a.getDescription()).setEscapeModelStrings(false))
.setVisible(!Strings.isEmpty(a.getDescription()))
);
add(new Label("startLbl", getString(1153L, langId)));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java?rev=1655003&r1=1655002&r2=1655003&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
Tue Jan 27 10:42:35 2015
@@ -36,7 +36,7 @@ public class UpdatedAppointmentTemplate
add(new Label("title", a.getTitle()));
add(new WebMarkupContainer("descContainer")
.add(new Label("descLbl", getString(1152L, langId)))
- .add(new Label("desc", a.getDescription()))
+ .add(new Label("desc",
a.getDescription()).setEscapeModelStrings(false))
.setVisible(!Strings.isEmpty(a.getDescription()))
);
add(new Label("startLbl", getString(1153L, langId)));
