This is an automated email from the git hooks/post-receive script. New commit to branch feature/redimensionnement in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 1bb5d9626e779438b66a7852d6a822e9e7236a81 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 27 10:37:30 2018 +0200 Add comment and clean code --- .../franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java index b97c51f0..66333742 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java @@ -92,6 +92,8 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? if (currentEmail.isEditable() && takenBy != null && !currentUser.equals(takenBy)) { MailFolder folderWithMustTakeToEditDemand = email.getMailFolder(); + + //Récupération de la configuration sur l'obligation de prendre le document pour éditer while (folderWithMustTakeToEditDemand.getParent() != null && folderWithMustTakeToEditDemand.getMustTakeToEditDemand() == null) { folderWithMustTakeToEditDemand = folderWithMustTakeToEditDemand.getParent(); @@ -178,9 +180,8 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { DemandeUIModel currentEmail = getContext().getCurrentEmail(); - FaxToMailServiceContext serviceContext = getContext().newServiceContext(); - if (StringUtils.isNotBlank(currentEmail.getTopiaId())) { + FaxToMailServiceContext serviceContext = getContext().newServiceContext(); Email email = serviceContext.getEmailService().openEmail(currentEmail.getTopiaId(), getContext().getCurrentUser(), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.