Author: kmorin Date: 2014-12-08 11:53:29 +0000 (Mon, 08 Dec 2014) New Revision: 724 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/724 Log: fix mauvaise requete de recherche Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 15:37:03 UTC (rev 723) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-08 11:53:29 UTC (rev 724) @@ -390,12 +390,12 @@ + "WHERE E." + TopiaEntity.PROPERTY_TOPIA_ID + " IN ("; if (searchFilter.isAddGroupDemands()) { - hqlForFetchStep1 += "SELECT CASE WHEN E." + Email.PROPERTY_EMAIL_GROUP + " IS NULL " + + hqlForFetchStep1 += "SELECT CASE WHEN G IS NULL " + "THEN E." + TopiaEntity.PROPERTY_TOPIA_ID + " ELSE E2." + TopiaEntity.PROPERTY_TOPIA_ID + " END " + "FROM " + Email.class.getName() + " E " + - "INNER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + - "INNER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 "; + "LEFT OUTER JOIN E." + Email.PROPERTY_EMAIL_GROUP + " AS G " + + "LEFT OUTER JOIN G." + EmailGroup.PROPERTY_EMAIL + " AS E2 "; } else { hqlForFetchStep1 += "select E." + TopiaEntity.PROPERTY_TOPIA_ID + " FROM " + Email.class.getName() + " E "; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-12-05 15:37:03 UTC (rev 723) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-12-08 11:53:29 UTC (rev 724) @@ -414,12 +414,14 @@ UserService userService = serviceContext.getUserService(); setFaxtomailUserCache(userService.getAllActiveUsers()); - try { - setContactCache(serviceContext.getLdapService().getUserAndEmails()); + if (!config.isLdapMock()) { + try { + setContactCache(serviceContext.getLdapService().getUserAndEmails()); - } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Error while getting contact from ldap", e); + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("Error while getting contact from ldap", e); + } } } }