Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 7f8b4da9 by Tony Chemit at 2023-03-30T16:00:34+02:00 update pom - - - - - 3131b3b5 by Tony Chemit at 2023-03-30T16:01:03+02:00 Add FIXME - See #2656 - - - - - ac6896d5 by Tony Chemit at 2023-03-30T16:02:06+02:00 Lorsque l'on passe un type de données d'un statut 'Réalisé' à 'Non réalisé', il faudrait certainement mettre le programme de rattachement à null - Closes #2657 - - - - - 3 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutTreeAdapter.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - pom.xml Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/layout/MoveLayoutTreeAdapter.java ===================================== @@ -53,6 +53,7 @@ public abstract class MoveLayoutTreeAdapter<ParentNode extends ContentRootOpenab ParentNode oldParentNode = oldParentSupplier.get(); NavigationTreeConfig config = tree.getModel().getConfig(); String newParentId = request.getNewParentId(); + //FIXME NPE See https://gitlab.com/ultreiaio/ird-observe/-/issues/2656 String groupByValue = oldParentNode.getContext().getServicesProvider().getRootOpenableService().getGroupByValue(config.getGroupByName(), config.getGroupByFlavor(), newParentId); @SuppressWarnings("unchecked") ParentNode newParentNode = (ParentNode) tree.getModel().getNodeFromPath(new String[]{groupByValue, newParentId}, true); oldParentNode.updateNode(); ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java ===================================== @@ -156,7 +156,7 @@ public class TripUIModelStates extends GeneratedTripUIModelStates { bean.setObservationsComment(null); bean.setObservationsDataEntryOperator(null); bean.setObservationsDataQuality(null); -// bean.setObservationsProgram(null); + bean.setObservationsProgram(null); bean.setObserver(null); } else { //FIXME Something to set by default ? @@ -171,6 +171,7 @@ public class TripUIModelStates extends GeneratedTripUIModelStates { bean.setFishingTime(null); bean.setDepartureWellContentStatus(null); bean.setLandingWellContentStatus(null); + bean.setLogbookProgram(null); } else { if (bean.getDepartureWellContentStatus() == null) { bean.setDepartureWellContentStatus(defaultDepartureWellContentStatus); ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.13</version> + <version>2023.15</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e9e1ef309ab35982961668eed... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e9e1ef309ab35982961668eed... You're receiving this email because of your account on gitlab.com.