Author: vdegtyarev
Date: Tue Jan 21 05:31:49 2014
New Revision: 1559926
URL: http://svn.apache.org/r1559926
Log:
OPENMEETINGS-876 is fixed. The "Click here to enter room" link is not attached
to cancel email notification.
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.html
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1559926&r1=1559925&r2=1559926&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
Tue Jan 21 05:31:49 2014
@@ -358,7 +358,8 @@ public class InvitationManager implement
User owner = i.getInvitedBy();
String invitorName = owner.getFirstname() + " " +
owner.getLastname();
- String template =
InvitationTemplate.getEmail(i.getInvitee().getLanguage_id(), invitorName,
message, invitation_link);
+ boolean isCanceled = (type==MessageType.Cancel);
+ String template =
InvitationTemplate.getEmail(i.getInvitee().getLanguage_id(), invitorName,
message, invitation_link, isCanceled);
String email = i.getInvitee().getAdresses().getEmail();
String replyToEmail = owner.getAdresses().getEmail();
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.html?rev=1559926&r1=1559925&r2=1559926&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.html
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.html
Tue Jan 21 05:31:49 2014
@@ -24,10 +24,10 @@
<wicket:ommessage key="501"/> <span wicket:id="user"></span><br/>
<wicket:ommessage key="502"/> <span wicket:id="message"></span><br/>
- <b><wicket:ommessage key="503"/></b><br/>
+ <span wicket:id="comment_for_link1"></span><br/>
<a wicket:id="invitation_link1"><wicket:ommessage key="504"/></a><br/>
<br/><br/>
- <wicket:ommessage key="505"/><br/>
+ <span wicket:id="comment_for_link2"></span><br/>
<span wicket:id="invitation_link2"></span>
</wicket:panel>
</html>
\ No newline at end of file
Modified:
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java?rev=1559926&r1=1559925&r2=1559926&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
(original)
+++
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/mail/template/InvitationTemplate.java
Tue Jan 21 05:31:49 2014
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.mail.template;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.util.tester.WicketTester;
@@ -25,23 +26,33 @@ import org.apache.wicket.util.tester.Wic
public class InvitationTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
- public InvitationTemplate(String id, String user, String message,
String link) {
+ public InvitationTemplate(String id, String user, String message,
String link, boolean isCanceled) {
super(id);
add(new Label("user", user));
add(new Label("message", message));
- add(new ExternalLink("invitation_link1", link));
- add(new Label("invitation_link2",
link).setEscapeModelStrings(false));
+ Label commentForLink1 = new Label("comment_for_link1",
WebSession.getString(503));
+ commentForLink1.setVisible(!isCanceled);
+ add(commentForLink1);
+ ExternalLink externalLink1 = new
ExternalLink("invitation_link1", link);
+ externalLink1.setVisible(!isCanceled);
+ add(externalLink1);
+ Label commentForLink2 = new Label("comment_for_link2",
WebSession.getString(505));
+ commentForLink2.setVisible(!isCanceled);
+ add(commentForLink2);
+ Label externalLink2 = new Label("invitation_link2", link);
+
externalLink2.setEscapeModelStrings(false).setVisible(!isCanceled);
+ add(externalLink2);
}
public static String getEmail(String user, String message, String link)
{
- return getEmail(-1, user, message, link);
+ return getEmail(-1, user, message, link, false);
}
- public static String getEmail(long langId, String user, String message,
String link) {
+ public static String getEmail(long langId, String user, String message,
String link, boolean isCanceled) {
WicketTester tester = null;
try {
tester = ensureApplication(langId);
- return renderPanel(new
InvitationTemplate(TemplatePage.COMP_ID, user, message, link)).toString();
+ return renderPanel(new
InvitationTemplate(TemplatePage.COMP_ID, user, message, link,
isCanceled)).toString();
} finally {
if (tester != null) {
tester.destroy();
