branch develop updated (9501cdcf -> bd96ace0)
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 9501cdcf WARNING fixes #10065 : Supprime du code qui semble mort new bd96ace0 - fixes #10071 : Rafraîchissement de la liste des demandes après transfert ou archivage - Add a forgotten deletion of GeneratedPDFPages when archiving The 1 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 bd96ace0fb7b86b6db253ad3d811e88de30a4bb0 Author: jcouteau <couteau@codelutin.com> Date: Thu Aug 30 11:49:26 2018 +0200 - fixes #10071 : Rafraîchissement de la liste des demandes après transfert ou archivage - Add a forgotten deletion of GeneratedPDFPages when archiving Summary of changes: .../ui/swing/content/demande/actions/ArchiveAction.java | 15 +++++++++++---- .../content/demande/actions/ArchiveFromListAction.java | 14 +++++++------- .../ui/swing/content/transmit/actions/TransmitAction.java | 6 +----- 3 files changed, 19 insertions(+), 16 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 bd96ace0fb7b86b6db253ad3d811e88de30a4bb0 Author: jcouteau <couteau@codelutin.com> Date: Thu Aug 30 11:49:26 2018 +0200 - fixes #10071 : Rafraîchissement de la liste des demandes après transfert ou archivage - Add a forgotten deletion of GeneratedPDFPages when archiving --- .../ui/swing/content/demande/actions/ArchiveAction.java | 15 +++++++++++---- .../content/demande/actions/ArchiveFromListAction.java | 14 +++++++------- .../ui/swing/content/transmit/actions/TransmitAction.java | 6 +----- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java index 87880e6e..16d96764 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveAction.java @@ -26,11 +26,18 @@ package com.franciaflex.faxtomail.ui.swing.content.demande.actions; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUIHandler; +import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUI; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; +import com.franciaflex.faxtomail.ui.swing.content.transmit.MailFolderChooserUIHandler; +import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; +import jaxx.runtime.JAXXContext; +import jaxx.runtime.JAXXUtil; import javax.swing.*; import java.util.Collection; @@ -119,10 +126,10 @@ public class ArchiveAction extends SaveDemandeAndExitAction { @Override public void postSuccessAction() { - //FIXME enlever la rustine - if (getContext().isUseFolderCache()) { - getContext().getCurrentFolderEmails().removeDemand(getModel()); - } + //Reloading list for #10071 + //We are archiving from demand and not demandList so we can reload demand list doing : + getContext().getMainUI().getHandler().reloadDemandList(); + super.postSuccessAction(); } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java index d20805a9..ea9e8714 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/actions/ArchiveFromListAction.java @@ -136,6 +136,9 @@ public class ArchiveFromListAction extends SaveDemandeFromListAction { if (archiveChild != null) { email.setMailFolder(archiveChild); } + + //Clear PDF pages when archiving + email.clearPDFPages(); } modifiedProperties = new String[] { Email.PROPERTY_ARCHIVE_DATE }; @@ -144,13 +147,10 @@ public class ArchiveFromListAction extends SaveDemandeFromListAction { @Override public void postSuccessAction() { - List<DemandeUIModel> selectedEmails = getModel().getSelectedEmails(); - getModel().removeEmails(selectedEmails); - //FIXME enlever la rustine - if (getContext().isUseFolderCache()) { - getContext().getCurrentFolderEmails().removeAllDemands(selectedEmails); - } - super.postSuccessAction(); + //reload list to fix #10071 + getHandler().reloadList(); + //do not do super.postSuccessAction(); as it only useful + //for selection handling that is already managed in reloading } } diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java index 0b8d0227..6f15e9e0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/transmit/actions/TransmitAction.java @@ -121,15 +121,12 @@ public class TransmitAction extends AbstractFaxToMailAction<MailFolderChooserUIM @Override public void postSuccessAction() { - //FIXME enlever rustine - if (getContext().isUseFolderCache()) { - getContext().getCurrentFolderEmails().removeAllDemands(getModel().getDemandeUIModels()); - } super.postSuccessAction(); MailFolderChooserUIHandler handler = getHandler(); FaxToMailUI parentUI = (FaxToMailUI) getUI().getContextValue(JAXXContext.class, JAXXUtil.PARENT); + handler.closeFrame(); if (parentUI != null) { if (DemandeUI.class.isAssignableFrom(parentUI.getClass())) { @@ -148,6 +145,5 @@ public class TransmitAction extends AbstractFaxToMailAction<MailFolderChooserUIM } } - handler.closeFrame(); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm