March 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] 2 commits: Remettre en place la validation sur le formulaire suite à l'abandon d'une suppression (See #759)
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fa4fdc2d by Tony CHEMIT at 2017-03-30T09:16:27+02:00 Remettre en place la validation sur le formulaire suite à l'abandon d'une suppression (See #759) - - - - - fbe132a3 by Tony CHEMIT at 2017-03-30T09:20:15+02:00 Ne pas modifier le formulaire si on resélectionne dans l'abre le nœud courant (See #759) - - - - - 2 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -547,7 +547,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U try { ok = doDelete(getBean()); - + if (!ok) { + ui.restartEdit(); + } } catch (Exception e) { UIHelper.handlingError(e); } finally { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java @@ -91,7 +91,7 @@ public class NavigationTree extends JXTree { setSelectionModel(new DefaultTreeSelectionModel() { @Override public void setSelectionPath(TreePath path) { - boolean canChange = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); + boolean canChange = !Objects.equals(path, getSelectionPath()) && ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); if (!canChange) { // cancel the change of node return; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4d8a433a254e20d1a290d1fd8c…

1 0

[Git][ultreiaio/ird-observe][develop] Ajout message d'info sur les commentaires (pour le focus) (See #755)
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4d8a433a by Tony CHEMIT at 2017-03-30T08:57:21+02:00 Ajout message d'info sur les commentaires (pour le focus) (See #755) - - - - - 5 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx @@ -34,7 +34,10 @@ <JTextArea id='comment2' onKeyReleased='if (!comment2.getText().isEmpty() || model.getComment() != null) { model.setComment(comment2.getText().isEmpty() ? null : comment2.getText()); }'/> <JPanel id="columnHeader" layout="{new BorderLayout()}"> - <JLabel constraints='BorderLayout.WEST' text="{getTitle()}"/> + <JPanel layout="{new BorderLayout(3, 3)}" constraints='BorderLayout.WEST'> + <JLabel id='titleLabel' constraints='BorderLayout.WEST'/> + <JLabel id='infoLabel' constraints='BorderLayout.CENTER'/> + </JPanel> <JToolBar constraints='BorderLayout.EAST'> <JButton id="resetComment" styleClass='resetButton' onActionPerformed="model.setComment(null)"/> </JToolBar> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss @@ -12,3 +12,13 @@ #resetComment { toolTipText:"observe.action.resetComment.tip"; } + + +#titleLabel { + text: {getTitle()}; +} + +#infoLabel { + actionIcon:information; + toolTipText:"observe.action.comment.tip"; +} \ No newline at end of file ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -44,6 +44,7 @@ observe.action.close.route.tip=Close road observe.action.close.storage=Close storage observe.action.close.storage.tip=Close current storage observe.action.close.synchro.tip=close window +observe.action.comment.tip=<html><body><ul><li>To focus on next widget, use accelerator Ctrl + Tab</li><li>To focus on previous widget, use accelerator Ctrl + Shift + Tab</body></html> observe.action.config.export.required.read.referentiel=Read permission is required on referential for this operation observe.action.config.export.required.write.data=Write permission is required on data for this operation observe.action.configuration=Preferences ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -44,6 +44,7 @@ observe.action.close.route.tip=Cierre de la ruta abierta observe.action.close.storage=Cerrar la fuente de datos observe.action.close.storage.tip=Cerrar la fuente de datos usado actualmente observe.action.close.synchro.tip=Cerrar la ventana +observe.action.comment.tip=<html><body><ul><li>To focus on next widget, use accelerator Ctrl + Tab</li><li>To focus on previous widget, use accelerator Ctrl + Shift + Tab</body></html> \#TODO observe.action.config.export.required.read.referentiel=Debe tener derechos de lectura sobre el referencial de datos para esta operación observe.action.config.export.required.write.data=Debe tener derechos de escritura sobre los datos para esta operación observe.action.configuration=Configuración ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -45,6 +45,7 @@ observe.action.close.route.tip=Clôturer la route ouverte observe.action.close.storage=Fermer la source de données observe.action.close.storage.tip=Fermer la source de données actuellement utilisée observe.action.close.synchro.tip=Fermer la fenêtre +observe.action.comment.tip=<html><body><ul><li>Pour accéder au composant suivant, utilisez les raccourci clavier Ctrl + Tab</li><li>Pour accéder au composant précédent, utilisez les raccourci clavier Ctrl + Shift + Tab</body></html> observe.action.config.export.required.read.referentiel=Lecture sur le référentiel requis pour cette opération observe.action.config.export.required.write.data=Écriture sur les données requis pour cette opération observe.action.configuration=Configuration View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4d8a433a254e20d1a290d1fd8ca…

1 0

[Git][ultreiaio/ird-observe][develop] Faire fonctionner le raccourci F6 + revue aussi du F2 et F3 qui fonctionnent bie…
by Tony CHEMIT 29 Mar '17

29 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9d260751 by Tony CHEMIT at 2017-03-29T23:33:28+02:00 Faire fonctionner le raccourci F6 + revue aussi du F2 et F3 qui fonctionnent bien désormais (See #754) - - - - - 30 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectOpenNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/CloseDataGlobalUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9d260751885549e2f9b8e229660…

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: remove obsolete files
by Tony CHEMIT 29 Mar '17

29 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b2e2c85e by Tony CHEMIT at 2017-03-29T18:46:22+02:00 remove obsolete files - - - - - 8d2b41f5 by Tony CHEMIT at 2017-03-29T19:32:27+02:00 Ne pas faire de sauvegarde lorsqu'aucune modification n'a été effectuée sur la base (see #757) - - - - - 30 changed files: - − application-swing-decoration/changelog.txt - − application-swing-validation/changelog.txt - − application-swing/changelog.txt - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AutomaticLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/backup/LocalDatabaseBackupTaskSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectOpenNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e70a4e9e59cd0e19f335813b61…

1 0

[Git][ultreiaio/ird-observe][develop] Squash validators and validation modules
by Tony CHEMIT 29 Mar '17

29 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e70a4e9e by Tony CHEMIT at 2017-03-29T18:43:32+02:00 Squash validators and validation modules - - - - - 30 changed files: - application-swing-validation/pom.xml - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java → application-swing-validation/src/main/java/validators/AbstractSpeciesFieldDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivityFinDeVeilleExistsDtoValidator.java → application-swing-validation/src/main/java/validators/ActivityFinDeVeilleExistsDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java → application-swing-validation/src/main/java/validators/ActivitySimpleSpeedDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java → application-swing-validation/src/main/java/validators/ActivitySpeedDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CollectionUniqueKeyDtoValidator.java → application-swing-validation/src/main/java/validators/CollectionUniqueKeyDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CoordinateLatitudeDtoFieldValidator.java → application-swing-validation/src/main/java/validators/CoordinateLatitudeDtoFieldValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CoordinateLongitudeDtoFieldValidator.java → application-swing-validation/src/main/java/validators/CoordinateLongitudeDtoFieldValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ObserveCollectionUniqueKeyDtoValidator.java → application-swing-validation/src/main/java/validators/ObserveCollectionUniqueKeyDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/OpenableDtoFieldValidator.java → application-swing-validation/src/main/java/validators/OpenableDtoFieldValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/QuadrantFieldDtoValidator.java → application-swing-validation/src/main/java/validators/QuadrantFieldDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java → application-swing-validation/src/main/java/validators/SetLonglineUniqueHomeIdDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java → application-swing-validation/src/main/java/validators/SetLonglineUniqueNumberDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesLengthFieldDtoValidator.java → application-swing-validation/src/main/java/validators/SpeciesLengthFieldDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesWeightFieldDtoValidator.java → application-swing-validation/src/main/java/validators/SpeciesWeightFieldDtoValidator.java - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - − application-swing-validators/LICENSE.txt - − application-swing-validators/README.md - − application-swing-validators/pom.xml - − application-swing-validators/src/license/THIRD-PARTY.properties - − application-swing-validators/src/main/resources/i18n/application-swing-validators_en_GB.properties - − application-swing-validators/src/main/resources/i18n/application-swing-validators_es_ES.properties - − application-swing-validators/src/main/resources/i18n/application-swing-validators_fr_FR.properties - pom.xml - + services-binder/src/test/resources/log4j.properties - services-validation/pom.xml - services-validators/src/main/java/fr/ird/observe/services/validators/AbstractSpeciesFieldValidator.java → services-validation/src/main/java/fr/ird/observe/services/validators/AbstractSpeciesFieldValidator.java - services-validators/src/main/java/fr/ird/observe/services/validators/ActivityFinDeVeilleExistsValidator.java → services-validation/src/main/java/fr/ird/observe/services/validators/ActivityFinDeVeilleExistsValidator.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e70a4e9e59cd0e19f335813b616…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog after release 5.3.7 [skip ci]
by Tony CHEMIT 29 Mar '17

29 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b1185270 by Tony CHEMIT at 2017-03-29T18:03:33+02:00 update changelog after release 5.3.7 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-22 08:31. + * Last generated at 2017-03-29 18:02. ## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) @@ -57,6 +57,17 @@ * [[Evolution 742]](https://gitlab.com/ultreiaio/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 652]](https://gitlab.com/ultreiaio/ird-observe/issues/652) **Corriger le référentiel Espèce** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [5.3.7](https://gitlab.com/ultreiaio/ird-observe/milestones/91) + +**Closed at 2017-03-29.** + +### Download +* [Application (observe-5.3.7.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) +* [Serveur (observe-5.3.7.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) + +### Issues + * [[Anomalie 758]](https://gitlab.com/ultreiaio/ird-observe/issues/758) **Echec d'échange de marées entre bases centrales en v5** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [5.3.6](https://gitlab.com/ultreiaio/ird-observe/milestones/90) **Closed at 2017-03-22.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b11852701e62ef50b9e7cc5a539…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog after release 5.3.7 [skip ci]
by Tony CHEMIT 29 Mar '17

29 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b1185270 by Tony CHEMIT at 2017-03-29T18:03:33+02:00 update changelog after release 5.3.7 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-22 08:31. + * Last generated at 2017-03-29 18:02. ## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) @@ -57,6 +57,17 @@ * [[Evolution 742]](https://gitlab.com/ultreiaio/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 652]](https://gitlab.com/ultreiaio/ird-observe/issues/652) **Corriger le référentiel Espèce** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [5.3.7](https://gitlab.com/ultreiaio/ird-observe/milestones/91) + +**Closed at 2017-03-29.** + +### Download +* [Application (observe-5.3.7.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) +* [Serveur (observe-5.3.7.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) + +### Issues + * [[Anomalie 758]](https://gitlab.com/ultreiaio/ird-observe/issues/758) **Echec d'échange de marées entre bases centrales en v5** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [5.3.6](https://gitlab.com/ultreiaio/ird-observe/milestones/90) **Closed at 2017-03-22.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b11852701e62ef50b9e7cc5a539…

1 0

[Git][ultreiaio/ird-observe][develop] [Report 5.x] Correction de la génération des script d'import entre deux bases distantes (see #758)
by Tony CHEMIT 29 Mar '17

29 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0e3e8694 by Tony CHEMIT at 2017-03-29T17:09:26+02:00 [Report 5.x] Correction de la génération des script d'import entre deux bases distantes (see #758) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -251,10 +251,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple private WizardState doExecuteAction0() { ObserveSwingDataSource leftSource = getStepModel().getLeftSource(); - boolean leftSourceIsPG = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; ObserveSwingDataSource rightSource = getStepModel().getRightSource(); - boolean rightSourceIsPG = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks(); int size = tasks.size(); @@ -324,7 +322,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(rightSourceIsPG, programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId); ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.right.trip"), exportTripResult, @@ -349,7 +347,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(leftSourceIsPG, programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId); ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.left.trip"), exportTripResult, View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0e3e869453de7ece8cc830a0203…

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/5.3.7
by Tony CHEMIT 29 Mar '17

29 Mar '17

Tony CHEMIT deleted branch release/5.3.7 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v5.3.7
by Tony CHEMIT 29 Mar '17

29 Mar '17

Tony CHEMIT pushed new tag v5.3.7 at ultreiaio / ird-observe

1 0