July 2014 - Faxtomail-commits - mailman.cloud.codelutin.com

r416 - in trunk: faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 18 Jul '14

18 Jul '14

Author: echatellier Date: 2014-07-18 10:47:33 +0200 (Fri, 18 Jul 2014) New Revision: 416 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/416 Log: Restauration des dossiers d'archive Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-18 08:05:58 UTC (rev 415) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ArchiveAction.java 2014-07-18 08:47:33 UTC (rev 416) @@ -39,8 +39,11 @@ import com.google.common.collect.Iterables; /** + * Action d'archivage d'un mail. + * + * Passe le mail et statut archivé et déplace le mail dans le dossier d'archive le plus proche. + * * @author Kevin Morin (Code Lutin) - * */ public class ArchiveAction extends SaveDemandeAndExitAction { @@ -69,7 +72,11 @@ model.setDemandStatus(DemandStatus.ARCHIVED); model.setTakenBy(null); - /* FIXME see #5433: Supprimer les dossiers d'archives + // déplacement du mail dans le dossier d'archive le plus proche + // cela permet de déplacer les archives dans d'autre dossier pour leur appliquer + // des droits différents + // les dossiers d'archive ne sont pas visible dans l'arbre des dossiers, mais les archives + // peuvent être consultées dans la recherche MailFolder folder = model.getMailFolder(); MailFolder archiveChild = null; do { @@ -89,9 +96,11 @@ } while (archiveChild == null && folder != null); + // le dossier d'archive peut ne pas exister. Dans ce cas on laisse le mail dans le dossier + // d'origine if (archiveChild != null) { model.setMailFolder(archiveChild); - }*/ + } super.doAction(); } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-18 08:05:58 UTC (rev 415) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-18 08:47:33 UTC (rev 416) @@ -240,9 +240,7 @@ <span class="glyphicon" ng-class="{'glyphicon-chevron-right': !collapsed, 'glyphicon-chevron-down': collapsed}"></span> </a> <a ng-click="editMailFolder(mailFolder)">{{mailFolder.name}}</a> - <%-- FIXME see #5433: Supprimer les dossiers d'archives <a class="pull-right btn btn-info btn-xs" data-nodrag ng-click="newArchiveSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.hasArchiveFolder && !mailFolder.archiveFolder" tooltip="Créer un dossier d'archive"><span class="glyphicon glyphicon-plus"></span></a> - --%> <a class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="newSubFolder(this)" style="margin-left: 8px;" ng-show="!mailFolder.archiveFolder" tooltip="Créer un sous-dossier"><span class="glyphicon glyphicon-plus"></span></a> <span class="pull-right" tooltip="{{mailFolder.$cumulativeCount > 0 && 'Ce dossier contient ' + mailFolder.$cumulativeCount + ' demandes et ne peut pas être supprimé !'|| 'Supprimer ce dossier'}}"> <a class="btn btn-danger btn-xs" data-nodrag ng-click="deleteFolder(this)" ng-disabled="mailFolder.$cumulativeCount > 0"> @@ -808,7 +806,6 @@ </div> </div> </div> - <%-- FIXME see #5433: Supprimer les dossiers d'archives <div class="col-md-8" ng-show="selectedMailFolder.archiveFolder"> <h3>Édition du dossier {{selectedMailFolder.name}}</h3> @@ -888,7 +885,7 @@ </div> </div> </div> - </div>--%> + </div> </div> </div>

1 0

r415 - in trunk: faxtomail-persistence/src/main/java/com/franciaflex/faxtomail faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 18 Jul '14

18 Jul '14

Author: echatellier Date: 2014-07-18 10:05:58 +0200 (Fri, 18 Jul 2014) New Revision: 415 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/415 Log: Ajout de l'encodage requis pour le fichier Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-07-18 07:56:13 UTC (rev 414) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java 2014-07-18 08:05:58 UTC (rev 415) @@ -58,16 +58,6 @@ private static final Log log = LogFactory.getLog(FaxToMailConfiguration.class); - /*private static FaxToMailConfiguration instance; - - public static FaxToMailConfiguration getInstance() { - return instance; - } - - public static void setInstance(FaxToMailConfiguration instance) { - FaxToMailConfiguration.instance = instance; - }*/ - protected final String[] optionKeyToNotSave; protected File configFile; @@ -219,6 +209,10 @@ return jpaParameters; } + public String getImportFileEncoding() { + return applicationConfig.getOption(FaxToMailConfigurationOption.IMPORT_FILE_ENCODING.getKey()); + } + public String getSmtpHost() { return applicationConfig.getOption(FaxToMailConfigurationOption.SMTP_HOST.getKey()); } Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-07-18 07:56:13 UTC (rev 414) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfigurationOption.java 2014-07-18 08:05:58 UTC (rev 415) @@ -24,10 +24,12 @@ * #L% */ +import org.apache.commons.io.Charsets; import org.nuiton.config.ConfigOptionDef; import org.nuiton.util.Version; import javax.swing.*; + import java.awt.*; import java.io.File; import java.net.URL; @@ -92,6 +94,11 @@ "Chemin vers le fichier de configuration des journaux", null, String.class), + IMPORT_FILE_ENCODING( + "faxtomail.import.file.encoding", + "Encodage des fichiers des fichiers d'import", + Charsets.UTF_8.toString(), String.class), + LDAP_MOCK( "faxtomail.ldap.mock", "Utilisation d'un service ldap mock", "false", Boolean.class), Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-07-18 07:56:13 UTC (rev 414) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ReferentielService.java 2014-07-18 08:05:58 UTC (rev 415) @@ -25,6 +25,8 @@ */ import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -116,7 +118,7 @@ Binder<Client, Client> clientBinder = BinderFactory.newBinder(Client.class); Import<Client> importer = null; try { - importer = Import.newImport(clientImportModel, inputStream); + importer = Import.newImport(clientImportModel, new InputStreamReader(inputStream, getApplicationConfig().getImportFileEncoding())); for (Client client : importer) { Client current = dao.forCodeEquals(client.getCode()).addEquals(Client.PROPERTY_BRAND, client.getBrand()).findAnyOrNull(); @@ -138,7 +140,7 @@ } getPersistenceContext().commit(); - } catch (ImportRuntimeException e) { + } catch (ImportRuntimeException|UnsupportedEncodingException e) { String message; if (e.getCause() != null) { message = e.getCause().getMessage(); @@ -146,7 +148,6 @@ message = e.getMessage(); } throw new ApplicationTechnicalException(message, e); - } finally { IOUtils.closeQuietly(importer); IOUtils.closeQuietly(inputStream); @@ -159,12 +160,12 @@ EmailAccountTopiaDao dao = getPersistenceContext().getEmailAccountDao(); EmailAccountImportModel emailAccountImportModel = new EmailAccountImportModel(';'); - try (Import<EmailAccount> importer = Import.newImport(emailAccountImportModel, inputStream)) { + try (Import<EmailAccount> importer = Import.newImport(emailAccountImportModel, new InputStreamReader(inputStream, getApplicationConfig().getImportFileEncoding()))) { for (EmailAccount emailAccount : importer) { result.add(dao.create(emailAccount)); } getPersistenceContext().commit(); - } catch (ImportRuntimeException e) { + } catch (ImportRuntimeException|UnsupportedEncodingException e) { String message; if (e.getCause() != null) { message = e.getCause().getMessage(); @@ -184,13 +185,13 @@ MailFilterTopiaDao dao = getPersistenceContext().getMailFilterDao(); EmailFilterImportModel emailFilterImportModel = new EmailFilterImportModel(';', foldersByName); - try (Import<MailFilter> importer = Import.newImport(emailFilterImportModel, inputStream)) { + try (Import<MailFilter> importer = Import.newImport(emailFilterImportModel, new InputStreamReader(inputStream, getApplicationConfig().getImportFileEncoding()))) { for (MailFilter emailFilter : importer) { result.add(dao.create(emailFilter)); } getPersistenceContext().commit(); - } catch (ImportRuntimeException e) { + } catch (ImportRuntimeException|UnsupportedEncodingException e) { String message; if (e.getCause() != null) { message = e.getCause().getMessage(); @@ -211,7 +212,7 @@ EtatAttenteTopiaDao etatAttenteTopiaDao = getPersistenceContext().getEtatAttenteDao(); EtatAttenteImportModel importModel = new EtatAttenteImportModel(';'); - try (Import<EtatAttente> importer = Import.newImport(importModel, inputStream)) { + try (Import<EtatAttente> importer = Import.newImport(importModel, new InputStreamReader(inputStream, getApplicationConfig().getImportFileEncoding()))) { for (EtatAttente etatAttente : importer) { EtatAttente currentEtatAttente = etatAttenteTopiaDao.forLabelEquals(etatAttente.getLabel()).findAnyOrNull(); @@ -224,7 +225,7 @@ } getPersistenceContext().commit(); - } catch (ImportRuntimeException e) { + } catch (ImportRuntimeException|UnsupportedEncodingException e) { String message; if (e.getCause() != null) { message = e.getCause().getMessage(); @@ -245,7 +246,7 @@ PriorityTopiaDao priorityTopiaDao = getPersistenceContext().getPriorityDao(); PriorityImportModel importModel = new PriorityImportModel(';'); - try (Import<Priority> importer = Import.newImport(importModel, inputStream)) { + try (Import<Priority> importer = Import.newImport(importModel, new InputStreamReader(inputStream, getApplicationConfig().getImportFileEncoding()))) { for (Priority priority : importer) { Priority currentPriority = priorityTopiaDao.forLabelEquals(priority.getLabel()).findAnyOrNull(); @@ -258,7 +259,7 @@ } getPersistenceContext().commit(); - } catch (ImportRuntimeException e) { + } catch (ImportRuntimeException|UnsupportedEncodingException e) { String message; if (e.getCause() != null) { message = e.getCause().getMessage(); @@ -279,7 +280,7 @@ RangeTopiaDao rangeTopiaDao = getPersistenceContext().getRangeDao(); RangeImportModel importModel = new RangeImportModel(';'); - try (Import<Range> importer = Import.newImport(importModel, inputStream)) { + try (Import<Range> importer = Import.newImport(importModel, new InputStreamReader(inputStream, getApplicationConfig().getImportFileEncoding()))) { for (Range range : importer) { Range currentRange = rangeTopiaDao.forLabelEquals(range.getLabel()).findAnyOrNull(); @@ -292,7 +293,7 @@ } getPersistenceContext().commit(); - } catch (ImportRuntimeException e) { + } catch (ImportRuntimeException|UnsupportedEncodingException e) { String message; if (e.getCause() != null) { message = e.getCause().getMessage(); @@ -312,7 +313,7 @@ DemandTypeTopiaDao demandTypeTopiaDao = getPersistenceContext().getDemandTypeDao(); DemandTypeImportModel importModel = new DemandTypeImportModel(';'); - try (Import<DemandType> importer = Import.newImport(importModel, inputStream)) { + try (Import<DemandType> importer = Import.newImport(importModel, new InputStreamReader(inputStream, getApplicationConfig().getImportFileEncoding()))) { for (DemandType demandType : importer) { DemandType currentDemandType = demandTypeTopiaDao.forLabelEquals(demandType.getLabel()).findAnyOrNull(); @@ -325,7 +326,7 @@ } getPersistenceContext().commit(); - } catch (ImportRuntimeException e) { + } catch (ImportRuntimeException|UnsupportedEncodingException e) { String message; if (e.getCause() != null) { message = e.getCause().getMessage(); Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-07-18 07:56:13 UTC (rev 414) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-07-18 08:05:58 UTC (rev 415) @@ -44,7 +44,8 @@ <div class="form-group"> <label for="clientField" class="control-label">Fichier client :</label> <input type="file" id="clientField" name="clientFile" class="form-control"> - <p class="help-block">Format du fichier csv : <code>Id_Correspondance;Societe;Nom;Caracteristique1;Caracteristique2;Caracteristique3;Numero_Fax;Adresse_Mail;Code_Client</code></p> + <p class="help-block">Format du fichier csv : <code>Id_Correspondance;Societe;Nom;Caracteristique1;Caracteristique2;Caracteristique3;Numero_Fax;Adresse_Mail;Code_Client</code><br /> + Encodage du fichier csv : <code>${applicationConfig.importFileEncoding}</code></p> </div> <button type="submit" class="btn btn-primary navbar-btn">Valider</button> <hr /> @@ -52,7 +53,8 @@ <div class="form-group"> <label for="etatAttenteField" class="control-label">Fichier état d'attente :</label> <input type="file" id="etatAttenteField" name="etatAttenteFile" class="form-control"> - <p class="help-block">Format du fichier csv : <code>etatattente</code></p> + <p class="help-block">Format du fichier csv : <code>etatattente</code><br /> + Encodage du fichier csv : <code>${applicationConfig.importFileEncoding}</code></p> </div> <button type="submit" class="btn btn-primary navbar-btn">Valider</button> <hr /> @@ -60,7 +62,8 @@ <div class="form-group"> <label for="demandTypeField" class="control-label">Fichier types de demande :</label> <input type="file" id="demandTypeField" name="demandTypeFile" class="form-control"> - <p class="help-block">Format du fichier csv : <code>demandetype</code></p> + <p class="help-block">Format du fichier csv : <code>demandetype</code><br /> + Encodage du fichier csv : <code>${applicationConfig.importFileEncoding}</code></p> </div> <button type="submit" class="btn btn-primary navbar-btn">Valider</button> <hr /> @@ -68,7 +71,8 @@ <div class="form-group"> <label for="rangeField" class="control-label">Fichier gamme :</label> <input type="file" id="rangeField" name="rangeFile" class="form-control"> - <p class="help-block">Format du fichier csv : <code>gamme</code></p> + <p class="help-block">Format du fichier csv : <code>gamme</code><br /> + Encodage du fichier csv : <code>${applicationConfig.importFileEncoding}</code></p> </div> <button type="submit" class="btn btn-primary navbar-btn">Valider</button> <hr /> @@ -76,7 +80,8 @@ <div class="form-group"> <label for="priorityField" class="control-label">Fichier priorite :</label> <input type="file" id="priorityField" name="priorityFile" class="form-control"> - <p class="help-block">Format du fichier csv : <code>priorite</code></p> + <p class="help-block">Format du fichier csv : <code>priorite</code><br /> + Encodage du fichier csv : <code>${applicationConfig.importFileEncoding}</code></p> </div> <button type="submit" class="btn btn-primary navbar-btn">Valider</button>

1 0

r414 - in trunk: . faxtomail-ui-web
by echatellier＠users.forge.codelutin.com 18 Jul '14

18 Jul '14

Author: echatellier Date: 2014-07-18 09:56:13 +0200 (Fri, 18 Jul 2014) New Revision: 414 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/414 Log: Update hibernate. Fix libs. Modified: trunk/faxtomail-ui-web/pom.xml trunk/pom.xml Modified: trunk/faxtomail-ui-web/pom.xml =================================================================== --- trunk/faxtomail-ui-web/pom.xml 2014-07-17 14:38:40 UTC (rev 413) +++ trunk/faxtomail-ui-web/pom.xml 2014-07-18 07:56:13 UTC (rev 414) @@ -133,7 +133,7 @@ <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <artifactId>javax.servlet-api</artifactId> </dependency> <dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-17 14:38:40 UTC (rev 413) +++ trunk/pom.xml 2014-07-18 07:56:13 UTC (rev 414) @@ -106,7 +106,7 @@ <eugeneVersion>2.11</eugeneVersion> <topiaVersion>3.0-beta-7</topiaVersion> - <hibernateVersion>4.3.5.Final</hibernateVersion> + <hibernateVersion>4.3.6.Final</hibernateVersion> <h2Version>1.3.176</h2Version> <jaxxVersion>2.8.7</jaxxVersion> @@ -118,9 +118,8 @@ <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <bootstrapPluginVersion>2.0.0</bootstrapPluginVersion> <slf4jVersion>1.7.7</slf4jVersion> - <mockitoVersion>1.9.5</mockitoVersion> <postgresqlDriverVersion>9.3-1101-jdbc41</postgresqlDriverVersion> - <commonsEmailVersion>1.3.2</commonsEmailVersion> + <commonsEmailVersion>1.3.3</commonsEmailVersion> <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> @@ -362,11 +361,10 @@ </dependency>  - <dependency> <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> + <artifactId>javax.servlet-api</artifactId> + <version>3.0.1</version> <scope>provided</scope> </dependency>

1 0

r413 - trunk/faxtomail-persistence/src/main/xmi
by echatellier＠users.forge.codelutin.com 17 Jul '14

17 Jul '14

Author: echatellier Date: 2014-07-17 16:38:40 +0200 (Thu, 17 Jul 2014) New Revision: 413 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/413 Log: Fix lazy initialization si la colonne "takenBy" n'est pas affich?\195?\169e Idem "lockedBy" Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-17 14:18:33 UTC (rev 412) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-17 14:38:40 UTC (rev 413) @@ -96,7 +96,8 @@ com.franciaflex.faxtomail.persistence.entities.Email.attribute.etatAttente.tagvalue.lazy=false com.franciaflex.faxtomail.persistence.entities.Email.attribute.emailGroup.tagvalue.lazy=false com.franciaflex.faxtomail.persistence.entities.Email.attribute.replies.tagvalue.lazy=false -com.franciaflex.faxtomail.persistence.entities.Email.attribute.replies.takenBy.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.takenBy.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.lockedBy.tagvalue.lazy=false # History com.franciaflex.faxtomail.persistence.entities.History.attribute.type.tagvalue.notNull=true

1 0

r412 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com 17 Jul '14

17 Jul '14

Author: echatellier Date: 2014-07-17 16:18:33 +0200 (Thu, 17 Jul 2014) New Revision: 412 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/412 Log: fixes #5453: Utilisation de execAndWait pour la mise ?\195?\160 jour ldap Added: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-wait.jsp Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-07-17 12:11:37 UTC (rev 411) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-07-17 14:18:33 UTC (rev 412) @@ -52,6 +52,28 @@ private static final Log log = LogFactory.getLog(LdapService.class); /** + * Retourne le nombre d'utilisateur en base. + * + * @return user count + */ + public long getUserCount() { + FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); + long result = faxtomailUserDao.count(); + return result; + } + + /** + * Retourne le nombre de groupe en base. + * + * @return group count + */ + public long getGroupCount() { + FaxToMailUserGroupTopiaDao faxtomailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); + long result = faxtomailUserGroupDao.count(); + return result; + } + + /** * Update all user and group from ldap. */ public void updateLdapData() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-17 12:11:37 UTC (rev 411) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-17 14:18:33 UTC (rev 412) @@ -110,7 +110,7 @@ } } // / getValidRangeRowModels() - + demand.setValid(handler.isDemandeValid(demand)); demands.add(demand); } Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-07-17 12:11:37 UTC (rev 411) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-07-17 14:18:33 UTC (rev 412) @@ -110,6 +110,8 @@ } else if (FaxToMailConfiguration.class.isAssignableFrom(propertyType)) { toInject = getFaxToMailApplicationContext(invocation).getApplicationConfig(); + } else if (FaxToMailApplicationContext.class.isAssignableFrom(propertyType)) { + toInject = getFaxToMailApplicationContext(invocation); } if (toInject != null) { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-07-17 12:11:37 UTC (rev 411) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/LdapAction.java 2014-07-17 14:18:33 UTC (rev 412) @@ -30,7 +30,11 @@ import org.apache.struts2.convention.annotation.InterceptorRef; import org.apache.struts2.convention.annotation.InterceptorRefs; import org.apache.struts2.convention.annotation.Result; +import org.nuiton.jaxx.application.ApplicationContext; +import com.franciaflex.faxtomail.FaxToMailApplicationContext; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaPersistenceContext; +import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.LdapService; import com.franciaflex.faxtomail.web.FaxToMailActionSupport; import com.opensymphony.xwork2.Preparable; @@ -38,7 +42,9 @@ @InterceptorRefs({ @InterceptorRef("faxToMailInterceptor"), @InterceptorRef("loginInterceptor"), - @InterceptorRef("paramsPrepareParamsStack") + @InterceptorRef("paramsPrepareParamsStack"), + @InterceptorRef(value="execAndWait", + params={"excludeMethods","input"}) }) public class LdapAction extends FaxToMailActionSupport implements Preparable { @@ -46,10 +52,28 @@ protected LdapService ldapService; + protected long userCount; + + protected long groupCount; + + protected FaxToMailApplicationContext applicationContext; + + public void setApplicationContext(FaxToMailApplicationContext applicationContext) { + this.applicationContext = applicationContext; + } + public void setLdapService(LdapService ldapService) { this.ldapService = ldapService; } + public long getUserCount() { + return userCount; + } + + public long getGroupCount() { + return groupCount; + } + @Override public void prepare() throws Exception { // check authorization @@ -61,13 +85,29 @@ @Override @Action("ldap-input") public String input() throws Exception { + userCount = ldapService.getUserCount(); + groupCount = ldapService.getGroupCount(); return INPUT; } @Override - @Action(results = {@Result(type = "redirectAction", params = {"actionName", "ldap-input"})}) + @Action(results = { + @Result(name="wait", location="/WEB-INF/content/admin/ldap-wait.jsp"), + @Result(type = "redirectAction", params = {"actionName", "ldap-input"})}) public String execute() throws Exception { - ldapService.updateLdapData(); + + // cette methode doit ouvrir sa propre connexion sinon l'interceptor va la fermer + // and cause du execAndWait + FaxToMailTopiaPersistenceContext persistenceContext = applicationContext.newPersistenceContext(); + try { + persistenceContext = applicationContext.newPersistenceContext(); + FaxToMailServiceContext serviceContext = applicationContext.newServiceContext(persistenceContext); + LdapService ldapService2 = serviceContext.newService(LdapService.class); + ldapService2.updateLdapData(); + } finally { + persistenceContext.close(); + } + return SUCCESS; } } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-07-17 12:11:37 UTC (rev 411) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-input.jsp 2014-07-17 14:18:33 UTC (rev 412) @@ -28,14 +28,6 @@ <html> <head> <title>Ldap</title> - - <script type="text/javascript"> - function disableAndSubmit() { - $("#submit_button").attr("disabled", true); - $("#submit_button").text("Mise à jour en cours..."); - $("#main_form").submit(); - } - </script> </head> <body> @@ -44,11 +36,19 @@ <h1 class="page-header">Active Directory</h1> + La base de données contient actuellement : + <ul> + <li><strong>${userCount}</strong> utilisateurs + <li><strong>${groupCount}</strong> groupes + </ul> + + <hr /> + <s:form id="main_form" action="ldap" method="post"> Cette action permet d'importer tout les utilisateurs et les groupes du serveur Active Directory dans l'application FaxToMail. Cette action peut prendre quelques minutes. - <button id="submit_button" type="button" class="btn btn-primary navbar-btn" onclick="disableAndSubmit()">Mettre à jour les groupes et utilisateurs</button> + <button id="submit_button" type="submit" class="btn btn-primary navbar-btn">Mettre à jour les groupes et utilisateurs</button> </s:form> </div> Added: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-wait.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-wait.jsp (rev 0) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-wait.jsp 2014-07-17 14:18:33 UTC (rev 412) @@ -0,0 +1,44 @@ +<%-- + #%L + FaxToMail :: Web + $Id$ + $HeadURL$ + %% + Copyright (C) 2014 Franciaflex, Code Lutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --%> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html> +<%@taglib uri="/struts-tags" prefix="s" %> + +<html> + <head> + <title>Ldap</title> + <meta http-equiv="refresh" content="5;url=<s:url />"/> + </head> + + <body> + + <div id="main-container" class="container"> + + <h1 class="page-header">Active Directory</h1> + + <em>L'import des utilisateurs et groupes Active Directory est en cours...</em> + + </div> + </body> +</html> Property changes on: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/ldap-wait.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r411 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions
by echatellier＠users.forge.codelutin.com 17 Jul '14

17 Jul '14

Author: echatellier Date: 2014-07-17 14:11:37 +0200 (Thu, 17 Jul 2014) New Revision: 411 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/411 Log: Move log to debug Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-17 12:10:47 UTC (rev 410) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-17 12:11:37 UTC (rev 411) @@ -87,7 +87,9 @@ PaginationResult<Email> paginationResult = getContext().getEmailService().getEmailForFolder(folder, currentUser, model.getPaginationParameter()); List<Email> emails = paginationResult.getElements(); - log.info(emails.size() + " emails in folder " + folder.getName()); + if (log.isDebugEnabled()) { + log.debug(emails.size() + " emails in folder " + folder.getName()); + } List<DemandeUIModel> demands = new ArrayList<DemandeUIModel>(); for (Email email : emails) {

1 0

r410 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions
by echatellier＠users.forge.codelutin.com 17 Jul '14

17 Jul '14

Author: echatellier Date: 2014-07-17 14:10:47 +0200 (Thu, 17 Jul 2014) New Revision: 410 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/410 Log: Application de la s?\195?\169curit?\195?\169 pour lister les demandes d'un dossier interm?\195?\169diaire (qu'un utilisateur n'a pas le droit de lire) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-17 10:32:01 UTC (rev 409) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-07-17 12:10:47 UTC (rev 410) @@ -35,6 +35,7 @@ import java.io.Writer; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.Enumeration; import java.util.HashMap; @@ -461,12 +462,42 @@ dao.update(email); } - public PaginationResult<Email> getEmailForFolder(MailFolder folder, PaginationParameter page) { - EmailTopiaDao dao = getPersistenceContext().getEmailDao(); - PaginationResult<Email> result = dao.forMailFolderEquals(folder) + /** + * Recupère les demandes d'un dossier visible par un utilisateur. + * + * La methode et les résultats sont paginés. + * + * @param folder folder to get demande + * @param currentUser user to check rigth + * @param page pagination + * @return paginated results + */ + public PaginationResult<Email> getEmailForFolder(MailFolder folder, FaxToMailUser currentUser, PaginationParameter page) { + + // check if user can read current folder + MailFolder loopFolder = folder; + boolean readable = false; + while (!readable && loopFolder != null) { + // user + readable = (loopFolder.getReadRightUsers() != null && loopFolder.getReadRightUsers().contains(currentUser)) || + // groups + (currentUser.getUserGroups() != null && loopFolder.getReadRightGroups() != null && CollectionUtils.containsAny(currentUser.getUserGroups(), loopFolder.getReadRightGroups())); + + loopFolder = loopFolder.getParent(); + } + + // perform request or not depending on rigths + PaginationResult<Email> result; + if (readable) { + EmailTopiaDao dao = getPersistenceContext().getEmailDao(); + result = dao.forMailFolderEquals(folder) .addNull(Email.PROPERTY_ARCHIVE_DATE) .addNotEquals(Email.PROPERTY_DEMAND_STATUS, DemandStatus.ARCHIVED) .findPage(page); + } else { + List<Email> elements = Collections.emptyList(); + result = PaginationResult.of(elements, 0, page); + } return result; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-17 10:32:01 UTC (rev 409) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-07-17 12:10:47 UTC (rev 410) @@ -24,7 +24,19 @@ * #L% */ +import static org.nuiton.i18n.I18n.t; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.JXTable; +import org.nuiton.util.pagination.PaginationResult; + import com.franciaflex.faxtomail.persistence.entities.Email; +import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeListUI; @@ -33,17 +45,6 @@ import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXTable; -import org.nuiton.util.pagination.PaginationResult; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static org.nuiton.i18n.I18n.t; - /** * Action de chargement des demandes d'un dossier lors de la selection d'un dossier dans l'arbre * des dossiers. @@ -82,8 +83,9 @@ DemandeListUIHandler handler = getHandler(); DemandeListUIModel model = getModel(); MailFolder folder = model.getSelectedFolder(); + FaxToMailUser currentUser = getContext().getCurrentUser(); - PaginationResult<Email> paginationResult = getContext().getEmailService().getEmailForFolder(folder, model.getPaginationParameter()); + PaginationResult<Email> paginationResult = getContext().getEmailService().getEmailForFolder(folder, currentUser, model.getPaginationParameter()); List<Email> emails = paginationResult.getElements(); log.info(emails.size() + " emails in folder " + folder.getName());

1 0

r409 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by echatellier＠users.forge.codelutin.com 17 Jul '14

17 Jul '14

Author: echatellier Date: 2014-07-17 12:32:01 +0200 (Thu, 17 Jul 2014) New Revision: 409 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/409 Log: Correction d'une NPE si l'on essaye d'etendre des dossiers, o?\195?\185 l'utilisateur n'a pas les droits de d?\195?\169placement Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-17 10:31:20 UTC (rev 408) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java 2014-07-17 10:32:01 UTC (rev 409) @@ -194,8 +194,12 @@ // expand nodes for (MailFolder folder : foldersToExpand) { DefaultMutableTreeNode node = nodesByFolder.get(folder); - TreePath treePath = new TreePath(node.getPath()); - navigationTree.expandPath(treePath); + // le node peut être null, s'il n'est pas dans l'arbre car + // l'utilisateur n'a pas les droits de déplacement par exemple + if (node != null) { + TreePath treePath = new TreePath(node.getPath()); + navigationTree.expandPath(treePath); + } } return nodesByFolder;

1 0

r408 - trunk/faxtomail-persistence/src/main/xmi
by echatellier＠users.forge.codelutin.com 17 Jul '14

17 Jul '14

Author: echatellier Date: 2014-07-17 12:31:20 +0200 (Thu, 17 Jul 2014) New Revision: 408 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/408 Log: Fix lazy initialization si la colonne "takenBy" n'est pas affich?\195?\169e Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties =================================================================== --- trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-17 10:10:59 UTC (rev 407) +++ trunk/faxtomail-persistence/src/main/xmi/faxtomail.properties 2014-07-17 10:31:20 UTC (rev 408) @@ -96,6 +96,7 @@ com.franciaflex.faxtomail.persistence.entities.Email.attribute.etatAttente.tagvalue.lazy=false com.franciaflex.faxtomail.persistence.entities.Email.attribute.emailGroup.tagvalue.lazy=false com.franciaflex.faxtomail.persistence.entities.Email.attribute.replies.tagvalue.lazy=false +com.franciaflex.faxtomail.persistence.entities.Email.attribute.replies.takenBy.lazy=false # History com.franciaflex.faxtomail.persistence.entities.History.attribute.type.tagvalue.notNull=true

1 0

r407 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com 17 Jul '14

17 Jul '14

Author: echatellier Date: 2014-07-17 12:10:59 +0200 (Thu, 17 Jul 2014) New Revision: 407 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/407 Log: Verifie qu'un droit n'est pas ajout?\195?\169 plusieurs fois. Ajout de commentaire Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-17 09:16:57 UTC (rev 406) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-17 10:10:59 UTC (rev 407) @@ -919,11 +919,11 @@ if (index != -1) { $scope.selectedMailFolder.readRightUsers.splice(index, 1); } - var index = $scope.selectedMailFolder.writeRightUsers.indexOfByTopiaId(user); + index = $scope.selectedMailFolder.writeRightUsers.indexOfByTopiaId(user); if (index != -1) { $scope.selectedMailFolder.writeRightUsers.splice(index, 1); } - var index = $scope.selectedMailFolder.moveRightUsers.indexOfByTopiaId(user); + index = $scope.selectedMailFolder.moveRightUsers.indexOfByTopiaId(user); if (index != -1) { $scope.selectedMailFolder.moveRightUsers.splice(index, 1); } @@ -972,8 +972,11 @@ if (index != -1) { $scope.selectedMailFolder.writeRightGroups.splice(index, 1); } else { + // ajout automatique du droit de lecture pour un droit d'ecriture + if ($scope.selectedMailFolder.readRightGroups.indexOfByTopiaId(group) == -1) { + $scope.selectedMailFolder.readRightGroups.push(group); + } $scope.selectedMailFolder.writeRightGroups.push(group); - $scope.selectedMailFolder.readRightGroups.push(group); } }; // change le droit de déplacement du groupe @@ -1000,7 +1003,10 @@ if (index != -1) { $scope.selectedMailFolder.writeRightUsers.splice(index, 1); } else { - $scope.selectedMailFolder.readRightUsers.push(user); + // ajout automatique du droit de lecture pour un droit d'ecriture + if ($scope.selectedMailFolder.readRightUsers.indexOfByTopiaId(user) == -1) { + $scope.selectedMailFolder.readRightUsers.push(user); + } $scope.selectedMailFolder.writeRightUsers.push(user); } };

1 0