branch develop updated (a6487173 -> e943e887)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from a6487173 fixes #10226 : Utilisation de Sujet à la place de Objet dans la recherche new 05fcbd31 Remove unused import new 004cee07 Close ressource new a40918fd Diamond new e943e887 Refs #10227 : Ajouter une vérification du contenu du mail pour forcer l'éditeur html si besoin The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e943e887028924d6b9000e0ad946cb7def49ee90 Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 29 09:41:24 2019 +0100 Refs #10227 : Ajouter une vérification du contenu du mail pour forcer l'éditeur html si besoin Forçage sans vérification du contenu : - Utilisation html - Sinon utilisation du plain en html - Failback plain sur plain commit a40918fd946a1eb0fea7cae37234dfe0de529c0b Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 29 09:39:06 2019 +0100 Diamond commit 004cee073a134f83d7f962090870068287f55b21 Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 29 09:30:10 2019 +0100 Close ressource commit 05fcbd3175618d3cee850511ae3fabc1377bc0fe Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 29 08:49:09 2019 +0100 Remove unused import Summary of changes: .../faxtomail/ui/swing/actions/ShowDemandeAction.java | 2 -- .../faxtomail/ui/swing/actions/ShowRechercheAction.java | 6 ++++-- .../ui/swing/content/demande/DemandeUIHandler.java | 4 ++-- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 15 +++++++++++++++ 4 files changed, 21 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 05fcbd3175618d3cee850511ae3fabc1377bc0fe Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 29 08:49:09 2019 +0100 Remove unused import --- .../com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java | 2 -- 1 file changed, 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 26a000f6..7ddb114a 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 @@ -22,7 +22,6 @@ package com.franciaflex.faxtomail.ui.swing.actions; * #L% */ -import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; @@ -150,7 +149,6 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { result = mailFolder != null && BooleanUtils.isTrue(mailFolder.getLockedDemandsOpenableInReadOnly()); if (result) { - currentEmail.setEditable(false); } else { String htmlMessage = t("faxtomail.alert.alreadyLockedBy.message", decorate(ex.getLockedBy())); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 004cee073a134f83d7f962090870068287f55b21 Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 29 09:30:10 2019 +0100 Close ressource --- .../franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java index 9e8b15e7..4bcfbfde 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowRechercheAction.java @@ -52,8 +52,10 @@ public class ShowRechercheAction extends AbstractChangeScreenAction { context.setCurrentPaginationParameter(null); FaxToMailUser currentUser = context.getCurrentUser(); - List<Client> allowedClients = context.newServiceContext().getClientService().getAllClientsForUser(currentUser); - getUI().setContextValue(allowedClients, SearchUIModel.PROPERTY_ALLOWED_CLIENTS); + try(FaxToMailServiceContext faxToMailServiceContext = context.newServiceContext()){ + List<Client> allowedClients = faxToMailServiceContext.getClientService().getAllClientsForUser(currentUser); + getUI().setContextValue(allowedClients, SearchUIModel.PROPERTY_ALLOWED_CLIENTS); + } super.doAction(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 a40918fd946a1eb0fea7cae37234dfe0de529c0b Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 29 09:39:06 2019 +0100 Diamond --- .../faxtomail/ui/swing/content/demande/DemandeUIHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java index b000a52f..1157dc06 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIHandler.java @@ -237,7 +237,7 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, initBeanFilterableComboBox(ui.getStatusComboBox(), Arrays.asList(DemandStatus.values()), model.getDemandStatus()); // utilisation des etats d'attente défini pour le dossier (si défini) - List<DemandType> demandTypes = new ArrayList<DemandType>(); + List<DemandType> demandTypes = new ArrayList<>(); Collection<DemandType> folderDemandTypes = getDemandTypeForFolder(folder); if (CollectionUtils.isEmpty(folderDemandTypes)) { demandTypes.addAll(getContext().getDemandTypeCache()); @@ -247,7 +247,7 @@ public class DemandeUIHandler extends AbstractFaxToMailUIHandler<DemandeUIModel, initBeanFilterableComboBox(ui.getDocTypeComboBox(), demandTypes, model.getDemandType()); // utilisation des etats d'attente défini pour le dossier (si défini) - List<WaitingState> waitingStates = new ArrayList<WaitingState>(); + List<WaitingState> waitingStates = new ArrayList<>(); Collection<WaitingState> folderWaitingStates = getWaitingStateForFolder(folder); if (CollectionUtils.isEmpty(folderWaitingStates)) { waitingStates.addAll(getContext().getWaitingStateCache()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 e943e887028924d6b9000e0ad946cb7def49ee90 Author: jcouteau <couteau@codelutin.com> Date: Tue Jan 29 09:41:24 2019 +0100 Refs #10227 : Ajouter une vérification du contenu du mail pour forcer l'éditeur html si besoin Forçage sans vérification du contenu : - Utilisation html - Sinon utilisation du plain en html - Failback plain sur plain --- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index 03d13ad0..48c02c2e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -357,6 +357,21 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { } // if there is no html content or if no html content can be correctly displayed (ie throws an exception) + // then display plain content as html (prevent plain content with html tags to be raw displayed) + if (textPanePanel.getComponentCount() == 0) { + + contents = demandeUIModel.getPlainContent(); + + for (String content : contents) { + if (content != null) { + addHtmlTextPane(handler, demandeUIModel, textPanePanel, content); + } + } + + } + + // if there is no html content or if no html content can be correctly displayed (ie throws an exception) + // fail back to plain old TextPane if (textPanePanel.getComponentCount() == 0) { contents = demandeUIModel.getPlainContent(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm