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 dc420fd24f3925543c0e2fac665ebebeda083d86 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 30 10:43:30 2015 +0100 enregistrement des sociétés dans le dossier même si c'est hérité (moins de requêtes pour trouver les dossiers d'une société) --- .../services/service/ConfigurationServiceImpl.java | 5 +++++ .../faxtomail/services/service/EmailServiceImpl.java | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java index 0e89d40..20313f8 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java @@ -326,6 +326,11 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements currentMailFolder.setParent(parent); + // set the parent's company if it is inherited + if (!currentMailFolder.isUseCurrentLevelCompany() && parent != null) { + currentMailFolder.setCompany(parent.getCompany()); + } + if (!currentMailFolder.isPersisted()) { currentMailFolder = dao.create(currentMailFolder); } diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 295f589..f16c517 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -990,14 +990,14 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe MailFolderTopiaDao mailFolderDao = getPersistenceContext().getMailFolderDao(); Collection<MailFolder> companyFolders = mailFolderDao.forCompanyEquals(company).findAll(); Set<MailFolder> archiveFolders = new HashSet<>(companyFolders); - for (MailFolder folder : companyFolders) { - Collection<MailFolder> children = folder.getChildren(); - if (children != null) { - for (MailFolder child : children) { - findCompanyFoldersChildren(child, archiveFolders); - } - } - } +// for (MailFolder folder : companyFolders) { +// Collection<MailFolder> children = folder.getChildren(); +// if (children != null) { +// for (MailFolder child : children) { +// findCompanyFoldersChildren(child, archiveFolders); +// } +// } +// } EmailTopiaDao emailDao = getPersistenceContext().getEmailDao(); return emailDao.findArchivedEmails(commandQuotationNumber, archiveFolders); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.