Author: kmorin Date: 2014-06-10 08:00:32 +0200 (Tue, 10 Jun 2014) New Revision: 169 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/169 Log: - 2 m?\195?\169thodes pour r?\195?\169cup?\195?\169rer les compts mail avec ou sans mot de passe - ajout du message ?\195?\160 envoyer en cas de rejet d'un mail (?\195?\160 ajouter dans l'ui) Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-09 21:04:09 UTC (rev 168) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-10 06:00:32 UTC (rev 169) @@ -142,10 +142,8 @@ * * @return all email account */ - public List<EmailAccount> getEmailAccounts() { - EmailAccountTopiaDao emailAccountTopiaDao = getPersistenceContext().getEmailAccountDao(); - List<EmailAccount> accounts = emailAccountTopiaDao.findAll(); - + public List<EmailAccount> getEmailAccountsWithoutPasswords() { + List<EmailAccount> accounts = getEmailAccounts(); // remove password information from bean final Binder<EmailAccount, EmailAccount> binderEmailAccount = BinderFactory.newBinder(EmailAccount.class); List<EmailAccount> result = Lists.transform(accounts, new Function<EmailAccount, EmailAccount>() { @@ -156,10 +154,16 @@ return account; } }); - + return result; } + public List<EmailAccount> getEmailAccounts() { + EmailAccountTopiaDao emailAccountTopiaDao = getPersistenceContext().getEmailAccountDao(); + List<EmailAccount> result = emailAccountTopiaDao.findAll(); + return result; + } + /** * * @param newEmailAccounts new email account list to save Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-09 21:04:09 UTC (rev 168) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ConfigurationAction.java 2014-06-10 06:00:32 UTC (rev 169) @@ -106,7 +106,7 @@ demandTypes = referentielService.getAllDemandType(); mailFolders = mailFolderService.getRootMailFolders(); mailFoldersUsage = mailFolderService.getMailFoldersUsage(); - emailAccounts = configurationService.getEmailAccounts(); + emailAccounts = configurationService.getEmailAccountsWithoutPasswords(); mailFilters = configurationService.getMailFilters(); configuration = configurationService.getConfiguration(); users = configurationService.getAllUsers();