branch develop updated (11ac7882 -> 8b962336)
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 11ac7882 Revert "A l'ouverture d'une demande, charger des clients du dossier en différé (refs #9502)" new 8b962336 chargé la liste des clients dès le lancement de l'appli 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 8b9623366b573217412e344a881fb37a5cb17c22 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Nov 22 09:52:47 2017 +0100 chargé la liste des clients dès le lancement de l'appli Summary of changes: .../faxtomail/ui/swing/FaxToMailUIContext.java | 19 +++++++++++++++++++ .../faxtomail/ui/swing/actions/ShowDemandeAction.java | 3 +-- 2 files changed, 20 insertions(+), 2 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 8b9623366b573217412e344a881fb37a5cb17c22 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Nov 22 09:52:47 2017 +0100 chargé la liste des clients dès le lancement de l'appli --- .../faxtomail/ui/swing/FaxToMailUIContext.java | 19 +++++++++++++++++++ .../faxtomail/ui/swing/actions/ShowDemandeAction.java | 3 +-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java index 8b4ccb28..67c21530 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java @@ -24,6 +24,7 @@ package com.franciaflex.faxtomail.ui.swing; import com.franciaflex.faxtomail.FaxToMailConfiguration; import com.franciaflex.faxtomail.persistence.RessourceClassLoader; +import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.DemandType; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.EmailFilter; @@ -56,6 +57,7 @@ import jaxx.runtime.swing.session.BeanDoubleListState; import jaxx.runtime.swing.session.BeanFilterableComboBoxState; import jaxx.runtime.swing.session.State; import jaxx.runtime.swing.session.SwingSession; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -234,6 +236,8 @@ public class FaxToMailUIContext extends AbstractBean implements Closeable, UIMes /** */ protected List<Contact> contactCache; + protected List<Client> clientCache; + protected EmailFilter emailFilter = new EmailFilter(); public static FaxToMailUIContext newContext(FaxToMailConfiguration config) { @@ -439,6 +443,13 @@ public class FaxToMailUIContext extends AbstractBean implements Closeable, UIMes } } } + + List<MailFolder> folders = serviceContext.getMailFolderService() + .getRootMailFoldersWithReadingRights(getCurrentUser()); + if (CollectionUtils.isNotEmpty(folders)) { + List<Client> clients = serviceContext.getClientService().getClientsForFolder(folders.get(0)); + setClientCache(clients); + } } /** @@ -846,6 +857,14 @@ public class FaxToMailUIContext extends AbstractBean implements Closeable, UIMes return useFolderCache; } + public List<Client> getClientCache() { + return clientCache; + } + + public void setClientCache(List<Client> clientCache) { + this.clientCache = clientCache; + } + public class FolderData { protected MailFolder folder; 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 ddae61d5..f66bc9d1 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 @@ -206,8 +206,7 @@ public class ShowDemandeAction extends AbstractMainUIFaxToMailAction { } } - MailFolder folder = currentEmail.getMailFolder(); - List<Client> allowedClients = serviceContext.getClientService().getClientsForFolder(folder); + List<Client> allowedClients = getContext().getClientCache(); currentEmail.setAllowedClients(allowedClients); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm