Author: solomax
Date: Sun Jan 27 23:14:54 2013
New Revision: 1439206
URL: http://svn.apache.org/viewvc?rev=1439206&view=rev
Log:
[OPENMEETINGS-518] ability to set alternative SMS reminder subject is added
Modified:
incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html?rev=1439206&r1=1439205&r2=1439206&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
(original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
Sun Jan 27 23:14:54 2013
@@ -790,6 +790,20 @@ limitations under the License.
2.1.x
</td>
</tr>
+ <tr>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ sms.subject
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ Subject of SMS reminder message
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ 2.1.x
+ </td>
+ </tr>
</table>
</blockquote>
</td></tr>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1439206&r1=1439205&r2=1439206&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
Sun Jan 27 23:14:54 2013
@@ -530,7 +530,9 @@ public class AppointmentLogic {
}
private String generateSMSSubject(String labelid1158, Appointment ment)
{
- return labelid1158 + " " + ment.getAppointmentName();
+ String subj = configurationDaoImpl.getConfValue("sms.subject",
String.class, null);
+ return subj == null || subj.length() == 0 ?
+ labelid1158 + " " + ment.getAppointmentName() :
subj;
}
/**
Modified:
incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml?rev=1439206&r1=1439205&r2=1439206&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
Sun Jan 27 23:14:54 2013
@@ -97,6 +97,12 @@
<td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> Area to be shown to the user after login. Possible
values are: dashboard.rooms, dashboard.chat, calendar, rooms.public,
rooms.private, rooms.user </td>
<td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 2.1.x </td>
</tr>
+ <tr>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> sms.subject </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> Subject of SMS reminder message </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 2.1.x </td>
+ </tr>
</table>
</section>
