This is an automated email from the git hooks/post-receive script. New change to branch feature/2246 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 31e9b45 Ne pas autoriser de réimporter des transects déjà existants (See #2246) new b3b3fac Ne pas pouvoir éditer les entitées transverses new 3209872 Ne pas autoriser de réimporter des opérations déjà existantes (See #2246) new dec2182 Renommage i18n new e847db7 Ajout toString new fa0d99e Bine utiliser la bonne page de résultat new 045c9fc Gérer la nullité d'erreur sur un import new 8690ac9 Meilleure gestion de la suppression d'un ImportLog The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8690ac9d3c8e864dbb6e13d085f1dcd9f246612f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 9 19:20:48 2016 +0200 Meilleure gestion de la suppression d'un ImportLog commit 045c9fc487758a476e73a9a9a4fae09f070d1640 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 9 19:20:14 2016 +0200 Gérer la nullité d'erreur sur un import commit fa0d99e448c1bd5ecfb5b26b105f755c90db949c Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 9 19:19:51 2016 +0200 Bine utiliser la bonne page de résultat commit e847db717f176fcec2da21cf4c64be64cf77c712 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 9 18:38:36 2016 +0200 Ajout toString commit dec218226fafb44f80dcc85e11ba2324f4c79119 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 9 18:37:56 2016 +0200 Renommage i18n commit 32098723e5d9346217d1be59713a9630832fe5c3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 9 18:37:39 2016 +0200 Ne pas autoriser de réimporter des opérations déjà existantes (See #2246) commit b3b3fac2a9ecde1f843db04c7e9a2ecca76c7d0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 9 18:36:32 2016 +0200 Ne pas pouvoir éditer les entitées transverses Summary of changes: .../echobase/entities/ImportFileTopiaDao.java | 15 ++++++++++--- .../echobase/entities/ImportLogTopiaDao.java | 6 ++++-- .../{DataImpl.java => GearMetadataValueImpl.java} | 8 +++---- ...taImpl.java => OperationMetadataValueImpl.java} | 9 ++++---- .../echobase/persistence/EchoBaseDbMeta.java | 5 +++++ .../services/service/UserDbPersistenceService.java | 22 +++++++++++++++++++ ...tion.java => DuplicatedOperationException.java} | 7 +++--- .../importdata/DuplicatedTransectException.java | 2 +- .../importdata/DuplicatedTransitException.java | 2 +- .../VoyageOperationsOperationImportAction.java | 6 ++++++ .../strategy/OperationRemoveDataStrategy.java | 25 ++++++++++++++++++++-- .../i18n/echobase-services_en_GB.properties | 7 +++--- .../i18n/echobase-services_fr_FR.properties | 5 +++-- .../jsp/importData/importDataActionResult.jsp | 2 +- .../jsp/importData/resultAcousticImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultCatchesImport.jsp | 2 +- .../jsp/importData/resultOperationImport.jsp | 2 +- .../WEB-INF/jsp/importData/resultResultsImport.jsp | 2 +- 18 files changed, 98 insertions(+), 31 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{DataImpl.java => GearMetadataValueImpl.java} (61%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/{DataImpl.java => OperationMetadataValueImpl.java} (60%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{DuplicatedTransitException.java => DuplicatedOperationException.java} (76%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.