Author: vdegtyarev Date: Mon Aug 12 06:07:04 2013 New Revision: 1513045 URL: http://svn.apache.org/r1513045 Log: OPENMEETINGS-744 is fixed. Private message is sent in the HTML version.
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.java openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserInfoDialog.java openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/ContactsHelper.java Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.java?rev=1513045&r1=1513044&r2=1513045&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.java (original) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessageDialog.java Mon Aug 12 06:07:04 2013 @@ -31,7 +31,9 @@ import org.apache.openmeetings.data.user import org.apache.openmeetings.data.user.dao.UsersDao; import org.apache.openmeetings.persistence.beans.room.Room; import org.apache.openmeetings.persistence.beans.user.PrivateMessage; +import org.apache.openmeetings.utils.mail.MailHandler; import org.apache.openmeetings.web.app.WebSession; +import org.apache.openmeetings.web.util.ContactsHelper; import org.apache.openmeetings.web.util.RoomTypeDropDown; import org.apache.openmeetings.web.util.UserAutoCompleteTextField; import org.apache.wicket.ajax.AjaxEventBehavior; @@ -60,6 +62,7 @@ public class MessageDialog extends Abstr private final WebMarkupContainer roomParams = new WebMarkupContainer("roomParams"); private final IModel<Date> modelStart = Model.of(new Date()); private final IModel<Date> modelEnd = Model.of(new Date()); + private boolean isPrivate = false; @Override public int getWidth() { @@ -71,7 +74,7 @@ public class MessageDialog extends Abstr open(target); } - public MessageDialog reset() { + public MessageDialog reset(boolean isPrivate) { modelStart.setObject(new Date()); modelEnd.setObject(new Date()); //TODO should we add 1 hour or generalize with Calendar??? PrivateMessage p = new PrivateMessage(); @@ -87,6 +90,7 @@ public class MessageDialog extends Abstr setModelObject(p); roomParams.setVisible(getModelObject().isBookedRoom()); form.setModelObject(p); + this.isPrivate = isPrivate; return this; } @@ -96,7 +100,7 @@ public class MessageDialog extends Abstr super.onOpen(target); } - public MessageDialog(String id, CompoundPropertyModel<PrivateMessage> model) { + public MessageDialog(String id, CompoundPropertyModel<PrivateMessage> model ) { super(id, WebSession.getString(1209), model); form = new Form<PrivateMessage>("form", getModel()); @@ -163,6 +167,19 @@ public class MessageDialog extends Abstr if (p.getTo().getUser_id() == null) { getBean(UsersDao.class).update(p.getTo(), getUserId()); } + //to send getBean(PrivateMessagesDao.class).update(p, getUserId()); + //to inbox + p.setPrivateMessageId(0); + p.setOwner(p.getTo()); + getBean(PrivateMessagesDao.class).update(p, getUserId()); + if (p.getTo().getAdresses() != null) { + String aLinkHTML = isPrivate ? "<br/><br/>" + "<a href='" + ContactsHelper.getLink() + "'>" + + WebSession.getString(1302) + "</a><br/>" : ""; + + getBean(MailHandler.class).send(p.getTo().getAdresses().getEmail(), + WebSession.getString(1301) + p.getSubject(), + p.getMessage().replaceAll("\\<.*?>", "") + aLinkHTML); + } } } Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1513045&r1=1513044&r2=1513045&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Mon Aug 12 06:07:04 2013 @@ -276,7 +276,7 @@ public class MessagesContactsPanel exten @Override protected void onEvent(AjaxRequestTarget target) { - newMessage.reset().open(target); + newMessage.reset(false).open(target); } }).add(new JQueryBehavior(".email.new", "button"))); folders.add(inbox.add(new AjaxEventBehavior("click") { @@ -608,7 +608,7 @@ public class MessagesContactsPanel exten @Override protected void onEvent(AjaxRequestTarget target) { - newMessage.reset().open(target, userId); + newMessage.reset(true).open(target, userId); } }).setVisible(!uc.getPending())); item.add(new WebMarkupContainer("delete").add(new AjaxEventBehavior("onclick") { Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserInfoDialog.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserInfoDialog.java?rev=1513045&r1=1513044&r2=1513045&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserInfoDialog.java (original) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserInfoDialog.java Mon Aug 12 06:07:04 2013 @@ -75,7 +75,7 @@ public class UserInfoDialog extends Abst public void onClose(AjaxRequestTarget target, DialogButton button) { if (button.equals(message)) { - newMessage.reset().open(target, userId); + newMessage.reset(false).open(target, userId); } else if (button.equals(contacts)) { ContactsHelper.addUserToContactList(userId); } Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1513045&r1=1513044&r2=1513045&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java (original) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java Mon Aug 12 06:07:04 2013 @@ -154,7 +154,7 @@ public class UserSearchPanel extends Use @Override protected void onEvent(AjaxRequestTarget target) { - newMessage.reset().open(target, userId); + newMessage.reset(true).open(target, userId); } })); //item.add(new TooltipBehavior(new Options("content", "TODO:: Picture will be displayed"))); //FIXME Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/ContactsHelper.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1513045&r1=1513044&r2=1513045&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/ContactsHelper.java (original) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/ContactsHelper.java Mon Aug 12 06:07:04 2013 @@ -63,7 +63,7 @@ public class ContactsHelper { , message.toString(), 0L, user, userToAdd, userToAdd, false, null , true, userContactId, userToAdd.getAdresses().getEmail()); - String link = WebSession.get().getBaseUrl() + "#" + PROFILE_MESSAGES.getArea().name() + "/" + PROFILE_MESSAGES.getType(); + String link = getLink(); String profileLinkHTML = "<a href='" + link + "'>" + fValue1196 + "</a><br/>"; @@ -121,4 +121,8 @@ public class ContactsHelper { } return userContactId; } + + public static String getLink() { + return WebSession.get().getBaseUrl() + "#" + PROFILE_MESSAGES.getArea().name() + "/" + PROFILE_MESSAGES.getType(); + } }