branch develop updated (02504d5 -> 2016f62)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 02504d5 Use pdfbox version 2.0.0-RC1 new 2b6c22c fixes #7685 Récupération des clients quand l'utilisateur n'a pas le droit de lecture sur le dossier portant la société new 2016f62 ajout automatique du wildcard null sur toutes les combo filtrable The 2 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 2016f62e5ef50f0eb70e14909563878c1927aa20 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 2 15:03:20 2015 +0100 ajout automatique du wildcard null sur toutes les combo filtrable commit 2b6c22c1b74b34f48c5669f0b497b20aa7f30fc4 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 2 15:02:25 2015 +0100 fixes #7685 Récupération des clients quand l'utilisateur n'a pas le droit de lecture sur le dossier portant la société Summary of changes: .../faxtomail/services/service/ClientServiceImpl.java | 12 ++++++++++++ .../faxtomail/ui/swing/content/search/SearchUIHandler.java | 1 - .../ui/swing/util/AbstractFaxToMailDemandListHandler.java | 9 +++++++-- .../faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java | 7 +++++++ 4 files changed, 26 insertions(+), 3 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 http://git.codelutin.com/faxtomail.git commit 2b6c22c1b74b34f48c5669f0b497b20aa7f30fc4 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 2 15:02:25 2015 +0100 fixes #7685 Récupération des clients quand l'utilisateur n'a pas le droit de lecture sur le dossier portant la société --- .../faxtomail/services/service/ClientServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java index c066c72..7382c76 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ClientServiceImpl.java @@ -315,6 +315,18 @@ public class ClientServiceImpl extends FaxToMailServiceSupport implements Client List<MailFolder> folders = getMailFolderService().getRootMailFoldersWithReadingRights(user); Set<String> companies = new HashSet<>(); + for (MailFolder folder : folders) { + + MailFolder folderWithCompany = folder; + while (!folderWithCompany.isUseCurrentLevelCompany() && folderWithCompany != null) { + folderWithCompany = folderWithCompany.getParent(); + } + + if (folderWithCompany != null) { + companies.add(folderWithCompany.getCompany()); + } + } + fetchCompaniesFromFolders(folders, companies); ClientTopiaDao clientDao = getPersistenceContext().getClientDao(); -- 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 http://git.codelutin.com/faxtomail.git commit 2016f62e5ef50f0eb70e14909563878c1927aa20 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 2 15:03:20 2015 +0100 ajout automatique du wildcard null sur toutes les combo filtrable --- .../faxtomail/ui/swing/content/search/SearchUIHandler.java | 1 - .../ui/swing/util/AbstractFaxToMailDemandListHandler.java | 9 +++++++-- .../faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java | 7 +++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java index a486e02..cd72c65 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java @@ -131,7 +131,6 @@ public class SearchUIHandler extends AbstractFaxToMailDemandListHandler<SearchUI model.getReplyBy()); BeanFilterableComboBox<Client> clientComboBox = ui.getClientComboBox(); - clientComboBox.getComboBoxModel().setWildcardCharacter(null); initBeanFilterableComboBox(clientComboBox, model.getAllowedClients(), model.getClient()); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java index d1216a8..d1509d3 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java @@ -57,12 +57,17 @@ import org.nuiton.validator.NuitonValidator; import org.nuiton.validator.NuitonValidatorFactory; import org.nuiton.validator.NuitonValidatorResult; -import javax.swing.*; +import javax.swing.JPopupMenu; +import javax.swing.JTable; +import javax.swing.SwingUtilities; import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableModel; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Font; +import java.awt.Point; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java index 7db3038..8898d99 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java @@ -37,6 +37,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; +import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox; import jaxx.runtime.swing.editor.bean.BeanUIUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -407,6 +408,12 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> } } + @Override + protected <E> void initBeanFilterableComboBox(BeanFilterableComboBox<E> comboBox, List<E> data, E selectedData, String decoratorContext) { + super.initBeanFilterableComboBox(comboBox, data, selectedData, decoratorContext); + comboBox.getComboBoxModel().setWildcardCharacter(null); + } + protected <HL extends HasLabel> void initCheckBoxComboBox(final JComboBox<HL> comboBox, java.util.List<HL> values, java.util.List<HL> selection, -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm