This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 51468b62a96c251fb977944b6ff436689858cff2 Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 27 13:46:35 2016 +0200 - chargement de la signature à l'ouverture du formulaire de réponse depuis la liste - on ne charge pas la signature si c'est un fax (refs #8258) --- .../swing/content/demande/actions/OpenReplyFormAction.java | 12 ++++++++++-- .../ui/swing/content/reply/actions/SenderChangedAction.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java index aa5f964..545029b 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/OpenReplyFormAction.java @@ -26,6 +26,7 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.actions; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.SigningForDomain; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.FaxToMailServiceUtils; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; @@ -39,8 +40,9 @@ import com.franciaflex.faxtomail.ui.swing.content.reply.ReplyFormUIModel; import jaxx.runtime.JAXXUtil; import org.apache.commons.lang3.StringUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.JFrame; +import javax.swing.SwingUtilities; +import java.awt.Dimension; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -73,6 +75,12 @@ public class OpenReplyFormAction extends AbstractFaxToMailAction<DemandeListUIMo frameContent = new ReplyFormUI(getUI()); ReplyFormUIModel model = frameContent.getModel(); + SigningForDomain signingForDomain = null; + if (!demand.isFax() && demand.getRecipient() != null) { + signingForDomain = getContext().newServiceContext().getConfigurationService().getSigningForEmailAddress(demand.getRecipient()).orNull(); + } + model.setSigning(signingForDomain); + model.setOriginalDemand(demand); String sender = JAXXUtil.getStringValue(demand.getSender()); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SenderChangedAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SenderChangedAction.java index 47ecf34..40ae4e7 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SenderChangedAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/actions/SenderChangedAction.java @@ -61,7 +61,7 @@ public class SenderChangedAction extends AbstractFaxToMailAction<ReplyFormUIMode ReplyFormUIModel model = getModel(); FaxToMailServiceContext serviceContext = getContext().newServiceContext(); signingForDomain = null; - if (model.getFrom() != null) { + if (!model.getOriginalDemand().isFax() && model.getFrom() != null) { signingForDomain = serviceContext.getConfigurationService().getSigningForEmailAddress(model.getFrom()).orNull(); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.