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

r517 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande
by kmorin＠users.forge.codelutin.com 11 Aug '14

11 Aug '14

Author: kmorin Date: 2014-08-11 12:58:27 +0200 (Mon, 11 Aug 2014) New Revision: 517 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/517 Log: fix compilation Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-11 10:43:42 UTC (rev 516) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-11 10:58:27 UTC (rev 517) @@ -200,7 +200,7 @@ } public void fromEntity(Email entity, List<MailField> fields) { - List<String> properties = new ArrayList<>(); + List<String> properties = new ArrayList<String>(); properties.add(Email.PROPERTY_TOPIA_ID); properties.add(Email.PROPERTY_TOPIA_ID); properties.add(Email.PROPERTY_TOPIA_ID);

1 0

r516 - in trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing: actions content/demande util
by kmorin＠users.forge.codelutin.com 11 Aug '14

11 Aug '14

Author: kmorin Date: 2014-08-11 12:43:42 +0200 (Mon, 11 Aug 2014) New Revision: 516 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/516 Log: fixes #5528 filtre sur les colonnes : il manque l'icone qui indique que la colonne est filtr?\195?\169e fixes #5526 dans la recherche, bug dans le statut : il apparait un 'sans' alors qu'il n'existe pas dans la liste bind seulement les propri?\195?\169t?\195?\169s r?\195?\169cup?\195?\169r?\195?\169es par le service 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/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.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-08-11 09:25:21 UTC (rev 515) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-08-11 10:43:42 UTC (rev 516) @@ -30,6 +30,8 @@ import java.util.Collection; import java.util.List; +import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; +import com.franciaflex.faxtomail.persistence.entities.MailField; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; @@ -75,6 +77,9 @@ dataTable.setName("dataTable" + columns); getContext().getSwingSession().add(dataTable, true); + // fixes #5528 filtre sur les colonnes : il manque l'icone qui indique que la colonne est filtrée + TableRowFilterSupport.forFilter(handler.getTableFilter()).searchable(true).useTableRenderers(true).apply(); + return true; } @@ -85,10 +90,11 @@ MailFolder folder = model.getSelectedFolder(); FaxToMailUser currentUser = getContext().getCurrentUser(); + List<MailField> columns = handler.getColumns(); PaginationResult<Email> paginationResult = getContext().newServiceContext().getEmailService() .getEmailForFolder(folder, currentUser, - handler.getColumns(), + columns, model.getPaginationParameter()); List<Email> emails = paginationResult.getElements(); if (log.isDebugEnabled()) { @@ -98,7 +104,7 @@ List<DemandeUIModel> demands = new ArrayList<DemandeUIModel>(); for (Email email : emails) { DemandeUIModel demand = new DemandeUIModel(); - demand.fromEntity(email); + demand.fromEntity(email, columns); // on ajoute toutes les lignes de rangeRow, // qui sont toutes valides puisqu'on les récupère de la base et qu'on ne sauvegarde que les lignes valides Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-08-11 09:25:21 UTC (rev 515) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-08-11 10:43:42 UTC (rev 516) @@ -113,9 +113,11 @@ /** Logger. */ private static final Log log = LogFactory.getLog(DemandeListUIHandler.class); - protected Map<String, String> pdfFieldValues; + protected ITableFilter<JTable> tableFilter; - protected DateFormat dayFormat = new SimpleDateFormat("dd/MM/yyyy"); + public ITableFilter<JTable> getTableFilter() { + return tableFilter; + } public final PropertyChangeListener selectedDemandeChangeListener = new PropertyChangeListener() { @Override @@ -160,7 +162,7 @@ initDemandeTable(dataTable, false); - final ITableFilter<JTable> tableFilter = new JTableFilter(dataTable) { + tableFilter = new JTableFilter(dataTable) { @Override protected boolean execute(int col, Collection<DistinctColumnItem> items) { @@ -175,10 +177,10 @@ return b; } - @Override - public void modelChanged(TableModel model) { - // do nothing - } +// @Override +// public void modelChanged(TableModel model) { +// // do nothing +// } }; TableRowFilterSupport.forFilter(tableFilter).searchable(true).useTableRenderers(true).apply(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-11 09:25:21 UTC (rev 515) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-08-11 10:43:42 UTC (rev 516) @@ -47,6 +47,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Collections2; +import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -193,9 +194,92 @@ */ @Override public void fromEntity(Email entity) { -// super.fromEntity(entity); fromBeanBinder.copyExcluding(entity, this, Email.PROPERTY_ATTACHMENT, Email.PROPERTY_MAIL_FOLDER); - + + loadAttachments(entity); + } + + public void fromEntity(Email entity, List<MailField> fields) { + List<String> properties = new ArrayList<>(); + properties.add(Email.PROPERTY_TOPIA_ID); + properties.add(Email.PROPERTY_TOPIA_ID); + properties.add(Email.PROPERTY_TOPIA_ID); + properties.add(Email.PROPERTY_TOPIA_ID); + properties.add(Email.PROPERTY_TOPIA_ID); + + boolean noFields = CollectionUtils.isEmpty(fields); + if (noFields || fields.contains(MailField.OBJECT)) { + properties.add(Email.PROPERTY_OBJECT); + } + if (noFields || fields.contains(MailField.PROJECT_REFERENCE)) { + properties.add(Email.PROPERTY_PROJECT_REFERENCE); + } + if (noFields || fields.contains(MailField.COMPANY_REFERENCE)) { + properties.add(Email.PROPERTY_COMPANY_REFERENCE); + } + if (noFields || fields.contains(MailField.COMMENT)) { + properties.add(Email.PROPERTY_COMMENT); + } + if (noFields || fields.contains(MailField.SENDER)) { + properties.add(Email.PROPERTY_SENDER); + } + if (noFields || fields.contains(MailField.RECEPTION_DATE)) { + properties.add(Email.PROPERTY_RECEPTION_DATE); + } + if (noFields || fields.contains(MailField.RECIPIENT)) { + properties.add(Email.PROPERTY_RECIPIENT); + } + if (noFields || fields.contains(MailField.DEMAND_STATUS)) { + properties.add(Email.PROPERTY_DEMAND_STATUS); + } + if (noFields || fields.contains(MailField.RECEPTION_DATE)) { + properties.add(Email.PROPERTY_RECEPTION_DATE); + } + if (noFields || fields.contains(MailField.EDI_RETURN)) { + properties.add(Email.PROPERTY_EDI_ERROR); + } + if (noFields || fields.contains(MailField.PRIORITY)) { + properties.add(Email.PROPERTY_PRIORITY); + } + if (noFields || fields.contains(MailField.DEMAND_TYPE)) { + properties.add(Email.PROPERTY_DEMAND_TYPE); + } + if (noFields || CollectionUtils.containsAny(fields, + Lists.newArrayList(MailField.CLIENT_BRAND, + MailField.CLIENT_CODE))) { + properties.add(Email.PROPERTY_CLIENT); + } + if (noFields || CollectionUtils.containsAny(fields, + Lists.newArrayList(MailField.REFERENCE, + MailField.QUOTATION_NB, + MailField.PF_NB, + MailField.SAV_NB))) { + properties.add(Email.PROPERTY_RANGE_ROW); + } + if (noFields || fields.contains(MailField.ETAT_ATTENTE)) { + properties.add(Email.PROPERTY_ETAT_ATTENTE); + } + if (noFields || fields.contains(MailField.TAKEN_BY)) { + properties.add(Email.PROPERTY_TAKEN_BY); + } + if (noFields || fields.contains(MailField.REPLIES)) { + properties.add(Email.PROPERTY_REPLIES); + } + if (noFields || fields.contains(MailField.ATTACHMENT)) { + properties.add(Email.PROPERTY_ATTACHMENT); + } + if (noFields || fields.contains(MailField.LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER)) { + properties.add(Email.PROPERTY_HISTORY); + } + + fromBeanBinder.copy(entity, this, properties.toArray(new String[properties.size()])); + + if (noFields || fields.contains(MailField.ATTACHMENT)) { + loadAttachments(entity); + } + } + + protected void loadAttachments(Email entity) { // On ne copie pas entierrement les attachments pour ne pas force le chargement du contenu binaire du fichier en mémoire. List<Attachment> attachmentCopy = new ArrayList<Attachment>(); if (entity.getAttachment() != null) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-11 09:25:21 UTC (rev 515) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-11 10:43:42 UTC (rev 516) @@ -230,9 +230,6 @@ table.setModel(tableModel); table.setColumnModel(columnModel); - // fixes #5528 filtre sur les colonnes : il manque l'icone qui indique que la colonne est filtrée - TableRowFilterSupport.forTable(table).apply(); - return StringUtils.join(columns, "-"); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java 2014-08-11 09:25:21 UTC (rev 515) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/CheckBoxComboBoxModel.java 2014-08-11 10:43:42 UTC (rev 516) @@ -37,8 +37,8 @@ */ public class CheckBoxComboBoxModel<HL extends HasLabel> extends AbstractListModel<HL> implements ComboBoxModel<HL> { - List<Object> selection; - List<HL> values; + private List<Object> selection; + private List<HL> values; public CheckBoxComboBoxModel(List<HL> values, List<HL> selection) { this.values = new ArrayList<HL>(); @@ -57,7 +57,9 @@ selection = new ArrayList<Object>(selection); if (selection.contains(anItem)) { selection.remove(anItem); - } else { + + // do not add the item if it si not in the universe values + } else if (values.contains(anItem)) { selection.add(anItem); } }

1 0

r515 - in trunk: . faxtomail-service
by echatellier＠users.forge.codelutin.com 11 Aug '14

11 Aug '14

Author: echatellier Date: 2014-08-11 11:25:21 +0200 (Mon, 11 Aug 2014) New Revision: 515 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/515 Log: Fix build Modified: trunk/faxtomail-service/pom.xml trunk/pom.xml Modified: trunk/faxtomail-service/pom.xml =================================================================== --- trunk/faxtomail-service/pom.xml 2014-08-11 09:13:14 UTC (rev 514) +++ trunk/faxtomail-service/pom.xml 2014-08-11 09:25:21 UTC (rev 515) @@ -92,6 +92,11 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> <dependency> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-11 09:13:14 UTC (rev 514) +++ trunk/pom.xml 2014-08-11 09:25:21 UTC (rev 515) @@ -110,11 +110,10 @@ <hibernateVersion>4.3.6.Final</hibernateVersion> <h2Version>1.3.176</h2Version> - <jaxxVersion>2.9</jaxxVersion> + <jaxxVersion>2.9.1</jaxxVersion>  <swingXVersion>1.6.4</swingXVersion> - <xworkVersion>2.3.15.1</xworkVersion> - + <xworkVersion>2.3.16.3</xworkVersion> <struts2Version>2.3.16.3</struts2Version> <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <bootstrapPluginVersion>2.0.0</bootstrapPluginVersion>

1 0

r514 - trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service
by echatellier＠users.forge.codelutin.com 11 Aug '14

11 Aug '14

Author: echatellier Date: 2014-08-11 11:13:14 +0200 (Mon, 11 Aug 2014) New Revision: 514 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/514 Log: Remove fetch only used in test Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-08-11 09:03:02 UTC (rev 513) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserService.java 2014-08-11 09:13:14 UTC (rev 514) @@ -40,6 +40,14 @@ List<FaxToMailUser> getAllActiveUsers(); + /** + * Get user by login. + * + * No fetching. + * + * @param login user login + * @return user by login + */ FaxToMailUser getUserByLogin(String login); List<FaxToMailUserGroup> getAllActiveUserGroups(); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java 2014-08-11 09:03:02 UTC (rev 513) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java 2014-08-11 09:13:14 UTC (rev 514) @@ -71,8 +71,6 @@ public FaxToMailUser getUserByLogin(String login) { FaxToMailUserTopiaDao dao = getPersistenceContext().getFaxToMailUserDao(); FaxToMailUser user = dao.forLoginEquals(login) - .addAllFetches(FaxToMailUser.PROPERTY_USER_GROUPS, - FaxToMailUser.PROPERTY_AFFECTED_FOLDERS) .findUnique(); return user; }

1 0

r513 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 11 Aug '14

11 Aug '14

Author: kmorin Date: 2014-08-11 11:03:02 +0200 (Mon, 11 Aug 2014) New Revision: 513 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/513 Log: fixes #5528 filtre sur les colonnes : il manque l'icone qui indique que la colonne est filtr?\195?\169e Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-10 16:06:55 UTC (rev 512) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-11 09:03:02 UTC (rev 513) @@ -24,6 +24,7 @@ * #L% */ +import com.ezware.oxbow.swingbits.table.filter.TableRowFilterSupport; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; @@ -147,25 +148,6 @@ TableColumnModelExt columnModel = new DefaultTableColumnModelExt(); if (CollectionUtils.isEmpty(columns)) { -// columns = Lists.newArrayList(MailField.PROPERTY_PRIORITY, -// MailField.PROPERTY_DEMAND_TYPE, -// MailField.PROPERTY_OBJECT, -// MailField.PROPERTY_CLIENT_CODE, -// MailField.PROPERTY_CLIENT_BRAND, -// MailField.PROPERTY_SENDER, -// MailField.PROPERTY_PROJECT_REFERENCE, -// MailField.PROPERTY_COMPANY_REFERENCE, -// MailField.PROPERTY_REFERENCE, -// MailField.PROPERTY_RECEPTION_DATE, -// MailField.PROPERTY_RECIPIENT, -// MailField.PROPERTY_DEMAND_STATUS, -// MailField.PROPERTY_ETAT_ATTENTE, -// MailField.PROPERTY_PF_NB, -// MailField.PROPERTY_SAV_NB, -// MailField.PROPERTY_TAKEN_BY, -// MailField.PROPERTY_LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER, -// MailField.PROPERTY_REPLIES, -// MailField.PROPERTY_ATTACHMENT); columns = Lists.newArrayList(MailField.getTableFields()); } @@ -248,6 +230,9 @@ table.setModel(tableModel); table.setColumnModel(columnModel); + // fixes #5528 filtre sur les colonnes : il manque l'icone qui indique que la colonne est filtrée + TableRowFilterSupport.forTable(table).apply(); + return StringUtils.join(columns, "-"); }

1 0

r512 - in trunk/faxtomail-service/src/test: java/com/franciaflex/faxtomail/services/service java/com/franciaflex/faxtomail/services/service/migration resources resources/db
by echatellier＠users.forge.codelutin.com 10 Aug '14

10 Aug '14

Author: echatellier Date: 2014-08-10 18:06:55 +0200 (Sun, 10 Aug 2014) New Revision: 512 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/512 Log: Ajout d'un test pour tester les scripts de migration Added: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java trunk/faxtomail-service/src/test/resources/db/ trunk/faxtomail-service/src/test/resources/db/h2data-1_0_0_rc2.h2.db Added: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java (rev 0) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/migration/FlywayMigrationTest.java 2014-08-10 16:06:55 UTC (rev 512) @@ -0,0 +1,113 @@ +package com.franciaflex.faxtomail.services.service.migration; + +/* + * #%L + * FaxToMail :: Service + * $Id: AbstractFaxToMailServiceTest.java 477 2014-08-06 08:46:09Z echatellier $ + * $HeadURL: https://svn.codelutin.com/faxtomail/trunk/faxtomail-service/src/test/java/c… $ + * %% + * 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% + */ + +import java.io.File; +import java.io.IOException; +import java.math.BigInteger; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.SystemUtils; +import org.hibernate.cfg.Environment; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.topia.flyway.TopiaFlywayService; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.util.FileUtil; + +import com.franciaflex.faxtomail.services.service.AbstractFaxToMailServiceTest; + +/** + * Restore la base de test dans src/test/resources/db et test que les migrations flyway fonctionnent bien. + */ +public class FlywayMigrationTest extends AbstractFaxToMailServiceTest { + + @Override + protected Map<String, String> getDatabaseConfiguration(String dataBase) { + Map<String, String> hibernateH2Config = new HashMap<String, String>(); + + // copy database to test it outside source directory + File tempDirFile = SystemUtils.getJavaIoTmpDir(); + databaseFile = new File(tempDirFile, dataBase); + try { + File db100rc2File = new File("src/test/resources/db/h2data-1_0_0_rc2.h2.db"); + FileUtils.copyFileToDirectory(db100rc2File, databaseFile); + } catch (IOException ex) { + Assert.fail("Can't copy db file to test dir"); + + } + + // sqlserver config + hibernateH2Config.put(Environment.DIALECT, "org.hibernate.dialect.H2Dialect"); + hibernateH2Config.put(Environment.DRIVER, "org.h2.Driver"); + hibernateH2Config.put(Environment.USER, "sa"); + hibernateH2Config.put(Environment.PASS, ""); + hibernateH2Config.put(Environment.HBM2DDL_AUTO, ""); + hibernateH2Config.put(Environment.URL, "jdbc:h2:file:" + databaseFile.getAbsolutePath() + "/h2data-1_0_0_rc2;MODE=MSSQLServer"); + System.out.println(databaseFile.getAbsolutePath() + "/h2data-1_0_0_rc2;"); + + // flyway config + hibernateH2Config.put("topia.service.migration", FaxtomailFlywayMigrationService.class.getName()); + hibernateH2Config.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "false"); + hibernateH2Config.put("topia.service.migration." + TopiaFlywayService.FLYWAY_INIT_VERSION, "1.0.0.438"); + + return hibernateH2Config; + } + + /** + * Vérifie la version de la base de données après les migrations qui sont sensées être passée. + */ + @Test + public void testFlywayMigrations() { + + // recupere le nombre de fichier de migration + List<File> migrationFiles = FileUtil.find(new File("src/main/resources/db/migration"), ".*\\.sql", false); + + // recupere dans la base le nombre de migration qui sont passée + Integer migrationCount = getServiceContext().getPersistenceContext().getSqlSupport().findSingleResult(new TopiaSqlQuery<Integer>() { + @Override + public PreparedStatement prepareQuery(Connection connection) throws SQLException { + return connection.prepareStatement("select count(*) from \"schema_version\""); + } + + @Override + public Integer prepareResult(ResultSet set) throws SQLException { + return set.getInt(1); + } + }); + + // il y en a au moins 4 depuis la version 1.0.0-rc-3 + Assert.assertTrue(migrationCount >= 4); + // +1 car il y a l'init en plus + Assert.assertEquals(migrationFiles.size() + 1, migrationCount.intValue()); + } +} Added: trunk/faxtomail-service/src/test/resources/db/h2data-1_0_0_rc2.h2.db =================================================================== (Binary files differ) Property changes on: trunk/faxtomail-service/src/test/resources/db/h2data-1_0_0_rc2.h2.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r511 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util
by kmorin＠users.forge.codelutin.com 08 Aug '14

08 Aug '14

Author: kmorin Date: 2014-08-08 18:34:58 +0200 (Fri, 08 Aug 2014) New Revision: 511 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/511 Log: fetch seulement les donn?\195?\169es utiles pour l'affichage 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/EmailServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 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/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.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-08-08 16:25:41 UTC (rev 510) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java 2014-08-08 16:34:58 UTC (rev 511) @@ -30,6 +30,7 @@ import com.franciaflex.faxtomail.persistence.entities.EmailFilter; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.HistoryType; +import com.franciaflex.faxtomail.persistence.entities.MailField; import com.franciaflex.faxtomail.persistence.entities.MailFolder; import com.franciaflex.faxtomail.persistence.entities.MailLock; import com.franciaflex.faxtomail.persistence.entities.Range; @@ -62,7 +63,7 @@ void transmitPendingDemandsToEdi(); - PaginationResult<Email> getEmailForFolder(MailFolder folder, FaxToMailUser currentUser, PaginationParameter page); + PaginationResult<Email> getEmailForFolder(MailFolder folder, FaxToMailUser currentUser, List<MailField> fields, PaginationParameter page); List<MailFolder> getChildrenRecursively(MailFolder folder); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-08 16:25:41 UTC (rev 510) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-08 16:34:58 UTC (rev 511) @@ -48,6 +48,7 @@ import javax.activation.FileDataSource; import javax.mail.MessagingException; +import com.google.common.collect.Collections2; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.io.IOUtils; @@ -66,6 +67,7 @@ import org.apache.pdfbox.pdmodel.interactive.form.PDField; import org.hibernate.Hibernate; import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.topia.persistence.TopiaQueryBuilderAddCriteriaOrRunQueryStep; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; import org.nuiton.util.pagination.PaginationParameter; @@ -532,31 +534,67 @@ * @return paginated results */ @Override - public PaginationResult<Email> getEmailForFolder(MailFolder folder, FaxToMailUser currentUser, PaginationParameter page) { + public PaginationResult<Email> getEmailForFolder(MailFolder folder, + FaxToMailUser currentUser, + List<MailField> fields, + PaginationParameter page) { // perform request or not depending on rigths PaginationResult<Email> result; if (folder.isFolderReadable()) { EmailTopiaDao dao = getPersistenceContext().getEmailDao(); - result = dao.forMailFolderEquals(folder) + TopiaQueryBuilderAddCriteriaOrRunQueryStep queryStep = + dao.forMailFolderEquals(folder) .addNull(Email.PROPERTY_ARCHIVE_DATE) - .addNotEquals(Email.PROPERTY_DEMAND_STATUS, DemandStatus.ARCHIVED) - .addAllFetches( - Email.PROPERTY_DEMAND_TYPE, - Email.PROPERTY_RANGE_ROW, - Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE, - Email.PROPERTY_HISTORY, - Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, - Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, - Email.PROPERTY_REPLIES, - Email.PROPERTY_ATTACHMENT, - Email.PROPERTY_TAKEN_BY, - Email.PROPERTY_CLIENT, - Email.PROPERTY_ETAT_ATTENTE, - Email.PROPERTY_PRIORITY - ) - .findPage(page); + .addNotEquals(Email.PROPERTY_DEMAND_STATUS, DemandStatus.ARCHIVED); + boolean noFields = CollectionUtils.isEmpty(fields); + if (noFields || fields.contains(MailField.PRIORITY)) { + queryStep.addFetch(Email.PROPERTY_PRIORITY); + } + if (noFields || fields.contains(MailField.DEMAND_TYPE)) { + queryStep.addFetch(Email.PROPERTY_DEMAND_TYPE); + } + if (noFields || CollectionUtils.containsAny(fields, + Lists.newArrayList(MailField.CLIENT_BRAND, + MailField.CLIENT_CODE))) { + queryStep.addFetch(Email.PROPERTY_CLIENT); + } + if (noFields || CollectionUtils.containsAny(fields, + Lists.newArrayList(MailField.REFERENCE, + MailField.QUOTATION_NB, + MailField.PF_NB, + MailField.SAV_NB))) { + queryStep.addFetch(Email.PROPERTY_RANGE_ROW + "." + RangeRow.PROPERTY_RANGE); + } + if (noFields || fields.contains(MailField.ETAT_ATTENTE)) { + queryStep.addFetch(Email.PROPERTY_ETAT_ATTENTE); + } + if (noFields || fields.contains(MailField.TAKEN_BY)) { + queryStep.addFetch(Email.PROPERTY_TAKEN_BY); + } + if (noFields || fields.contains(MailField.REPLIES)) { + queryStep.addFetch(Email.PROPERTY_REPLIES); + } + if (noFields || fields.contains(MailField.ATTACHMENT)) { + queryStep.addFetch(Email.PROPERTY_ATTACHMENT); + } + //TODO 20140808 kmorin remove when hql query coded + if (noFields || fields.contains(MailField.LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER)) { + queryStep.addAllFetches(Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, + Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS); + } + + result = queryStep.findPage(page); + + if (noFields || fields.contains(MailField.LAST_ATTACHMENT_OPENING_IN_THIS_FOLDER_USER)) { + Collection<String> topiaIds = Collections2.transform(result.getElements(), TopiaEntities.getTopiaIdFunction()); + //TODO 20140808 kmorin hql pour récupérer l'utilisateur de l'historique max date pour type = ouverture pj +// Email.PROPERTY_HISTORY, +// Email.PROPERTY_HISTORY + "." + History.PROPERTY_FAX_TO_MAIL_USER, +// Email.PROPERTY_HISTORY + "." + History.PROPERTY_FIELDS, + } + } else { List<Email> elements = Collections.emptyList(); result = PaginationResult.of(elements, 0, page); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-08-08 16:25:41 UTC (rev 510) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2014-08-08 16:34:58 UTC (rev 511) @@ -106,6 +106,9 @@ @Override public List<MailFolder> getRootMailFoldersWithReadingRights(FaxToMailUser user) { + FaxToMailUser upToDateUser = serviceContext.getUserService().getUser(user.getTopiaId()); + user.setAffectedFolders(upToDateUser.getAffectedFolders()); + MailFolderTopiaDao dao = getPersistenceContext().getMailFolderDao(); List<MailFolder> folders = new ArrayList<>(dao.getReadableFolders(user)); Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java 2014-08-08 16:25:41 UTC (rev 510) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/UserServiceImpl.java 2014-08-08 16:34:58 UTC (rev 511) @@ -86,7 +86,9 @@ @Override public FaxToMailUser getUser(String topiaId) { FaxToMailUserTopiaDao dao = getPersistenceContext().getFaxToMailUserDao(); - FaxToMailUser user = dao.forTopiaIdEquals(topiaId).findUnique(); + FaxToMailUser user = dao.forTopiaIdEquals(topiaId) + .addAllFetches(FaxToMailUser.PROPERTY_AFFECTED_FOLDERS) + .findUnique(); return user; } } Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-08-08 16:25:41 UTC (rev 510) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java 2014-08-08 16:34:58 UTC (rev 511) @@ -142,11 +142,11 @@ MailFolderTopiaDao mailFolderDao = getServiceContext().getPersistenceContext().getMailFolderDao(); MailFolder cyril = mailFolderDao.forNameEquals("Cyril").findUnique(); - PaginationResult<Email> page1 = service.getEmailForFolder(cyril, getCurrentUser(), page); + PaginationResult<Email> page1 = service.getEmailForFolder(cyril, getCurrentUser(), null, page); Assert.assertEquals(10, page1.getCount()); Assert.assertEquals(7, page1.getElements().size()); - PaginationResult<Email> page2 = service.getEmailForFolder(cyril, getCurrentUser(), page1.getNextPage()); + PaginationResult<Email> page2 = service.getEmailForFolder(cyril, getCurrentUser(), null, page1.getNextPage()); Assert.assertEquals(10, page2.getCount()); Assert.assertEquals(3, page2.getElements().size()); 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-08-08 16:25:41 UTC (rev 510) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/LoadFolderEmailsAction.java 2014-08-08 16:34:58 UTC (rev 511) @@ -86,7 +86,10 @@ FaxToMailUser currentUser = getContext().getCurrentUser(); PaginationResult<Email> paginationResult = getContext().newServiceContext().getEmailService() - .getEmailForFolder(folder, currentUser, model.getPaginationParameter()); + .getEmailForFolder(folder, + currentUser, + handler.getColumns(), + model.getPaginationParameter()); List<Email> emails = paginationResult.getElements(); if (log.isDebugEnabled()) { log.debug(emails.size() + " emails in folder " + folder.getName()); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-08-08 16:25:41 UTC (rev 510) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-08-08 16:34:58 UTC (rev 511) @@ -401,7 +401,7 @@ } @Override - protected List<MailField> getColumns() { + public List<MailField> getColumns() { List<MailField> tableColumns = null; MailFolder selectedFolder = getModel().getSelectedFolder(); if (selectedFolder != null) { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-08-08 16:25:41 UTC (rev 510) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchToGroupUIHandler.java 2014-08-08 16:34:58 UTC (rev 511) @@ -282,7 +282,7 @@ } @Override - protected List<MailField> getColumns() { + public List<MailField> getColumns() { if (tableColumns == null) { tableColumns = getContext().newServiceContext().getConfigurationService().getSearchDisplayColumns(); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-08-08 16:25:41 UTC (rev 510) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/search/SearchUIHandler.java 2014-08-08 16:34:58 UTC (rev 511) @@ -239,7 +239,7 @@ } @Override - protected List<MailField> getColumns() { + public List<MailField> getColumns() { if (tableColumns == null) { tableColumns = getContext().newServiceContext().getConfigurationService().getSearchDisplayColumns(); } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-08 16:25:41 UTC (rev 510) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailDemandListHandler.java 2014-08-08 16:34:58 UTC (rev 511) @@ -139,7 +139,7 @@ table.addMouseListener(getDataTableMouseListener()); } - protected abstract List<MailField> getColumns(); + public abstract List<MailField> getColumns(); public String populateColumnModel(JXTable table, boolean sortable) { List<MailField> columns = getColumns(); @@ -267,7 +267,6 @@ DemandeUIModel selectedEmail = tableModel.getEntry(rowIndex); onDoubleClickOnDemande(selectedEmail); - //TODO kmorin 02140806 put in action openDemand(selectedEmail); } }

1 0

r510 - trunk/faxtomail-persistence/src/main/resources
by athimel＠users.forge.codelutin.com 08 Aug '14

08 Aug '14

Author: athimel Date: 2014-08-08 18:25:41 +0200 (Fri, 08 Aug 2014) New Revision: 510 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/510 Log: Add a few indexes Added: trunk/faxtomail-persistence/src/main/resources/important-indexes.sql Added: trunk/faxtomail-persistence/src/main/resources/important-indexes.sql =================================================================== --- trunk/faxtomail-persistence/src/main/resources/important-indexes.sql (rev 0) +++ trunk/faxtomail-persistence/src/main/resources/important-indexes.sql 2014-08-08 16:25:41 UTC (rev 510) @@ -0,0 +1,25 @@ +CREATE INDEX email_receptionDate_idx ON email (receptionDate ASC); +CREATE INDEX email_archiveDate_idx ON email (archiveDate NULLS FIRST); +CREATE INDEX email_mailFolder_idx ON email (mailFolder); +CREATE INDEX email_demandStatus_idx ON email (demandStatus); + +CREATE INDEX email_takenBy_idx ON email(takenBy); +CREATE INDEX email_client_idx ON email(client); +--CREATE INDEX email_emailGroup_idx ON email(emailGroup); +CREATE INDEX email_etatAttente_idx ON email(etatAttente); +CREATE INDEX email_priority_idx ON email(priority); +CREATE INDEX email_demandType_idx ON email (demandType); + +CREATE INDEX demandType_fields_OWNER_idx ON demandType_fields (OWNER); +--CREATE INDEX rangeRow_email_idx ON rangeRow(email); +CREATE INDEX rangeRow_range_idx ON rangeRow(range); +--CREATE INDEX history_email_idx ON history(email); +CREATE INDEX history_faxToMailUser_idx ON history(faxToMailUser); +CREATE INDEX history_fields_OWNER_idx ON history_fields(OWNER); +--CREATE INDEX reply_email_idx ON reply(email); +--CREATE INDEX attachment_email_idx ON attachment(email); + + +CREATE INDEX mailfolder_readrightusers_readRightUsers_idx ON mailfolder_readrightusers(readRightUsers); +CREATE INDEX mailfolder_readrightgroups_readRightGroups_idx ON mailfolder_readrightgroups(readRightGroups); +

1 0

r509 - trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history
by echatellier＠users.forge.codelutin.com 08 Aug '14

08 Aug '14

Author: echatellier Date: 2014-08-08 17:26:47 +0200 (Fri, 08 Aug 2014) New Revision: 509 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/509 Log: fixes #5522: lors de l'envoi de l'historique dans le corps du mail, il y a bien les actions, mais pas les acteurs Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-08-08 15:24:12 UTC (rev 508) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/history/HistoryListUIHandler.java 2014-08-08 15:26:47 UTC (rev 509) @@ -139,6 +139,8 @@ if (!decoratedFields.isEmpty()) { historyAsString.append(" (" + decoratedFields + ")"); } + historyAsString.append(" : ").append(t("faxtomail.common.by.label")); + historyAsString.append(" ").append(decorateUser(history.getFaxToMailUser(), true)); historyAsString.append("\n"); } FaxToMailUIUtil.email(t("faxtomail.demande.history.send.subject", getModel().getTitle()), historyAsString.toString());

1 0

r508 - 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 kmorin＠users.forge.codelutin.com 08 Aug '14

08 Aug '14

Author: kmorin Date: 2014-08-08 17:24:12 +0200 (Fri, 08 Aug 2014) New Revision: 508 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/508 Log: use mailfolder method instead of recomputing the readable value Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-08 15:19:04 UTC (rev 507) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-08-08 15:24:12 UTC (rev 508) @@ -534,22 +534,9 @@ @Override public PaginationResult<Email> getEmailForFolder(MailFolder folder, FaxToMailUser currentUser, PaginationParameter page) { - MailFolderTopiaDao mailFolderTopiaDao = getPersistenceContext().getMailFolderDao(); - // check if user can read current folder - MailFolder loopFolder = mailFolderTopiaDao.forTopiaIdEquals(folder.getTopiaId()).findUnique(); - 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) { + if (folder.isFolderReadable()) { EmailTopiaDao dao = getPersistenceContext().getEmailDao(); result = dao.forMailFolderEquals(folder) .addNull(Email.PROPERTY_ARCHIVE_DATE) Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-08-08 15:19:04 UTC (rev 507) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/ShowDemandeAction.java 2014-08-08 15:24:12 UTC (rev 508) @@ -64,6 +64,7 @@ FaxToMailUser currentUser = getContext().getCurrentUser(); int answer = -1; + // si le mail est pris par quelqu'un d'autre, le prend-on ou pas ? if (takenBy != null && !currentUser.equals(takenBy)) { String htmlMessage = String.format( AbstractApplicationUIHandler.CONFIRMATION_FORMAT, @@ -77,11 +78,12 @@ JOptionPane.QUESTION_MESSAGE); } + // si on annule, on n'ouvre pas if (answer == JOptionPane.CANCEL_OPTION) { result = false; } else { - + // sinon on ouvre try { // tentative de verrouillages des email existants if (StringUtils.isNotBlank(currentEmail.getTopiaId())) { @@ -89,10 +91,11 @@ serviceContext.getEmailService().lockEmail(currentEmail.getTopiaId(), currentUser); } + // si on ne prend pas, le mail est en readonly if (answer == JOptionPane.NO_OPTION) { currentEmail.setEditable(false); } - // if the user takes the email + // si on prend, on prend et on rend editable else if (answer == JOptionPane.YES_OPTION) { FaxToMailServiceContext serviceContext = getContext().newServiceContext(); serviceContext.getEmailService().takeEmail(currentEmail.getTopiaId(), currentUser); @@ -100,7 +103,9 @@ currentEmail.setEditable(true); } - } catch (AlreadyLockedMailException ex) { + } + // le mail est locké, on ne fait rien + catch (AlreadyLockedMailException ex) { result = false; String htmlMessage = t("faxtomail.alert.alreadyLockedBy.message", decorate(ex.getLockedBy()));

1 0