Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe

Commits:

3 changed files:

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
    53 53
             ParentNode oldParentNode = oldParentSupplier.get();
    
    54 54
             NavigationTreeConfig config = tree.getModel().getConfig();
    
    55 55
             String newParentId = request.getNewParentId();
    
    56
    +        //FIXME NPE See https://gitlab.com/ultreiaio/ird-observe/-/issues/2656
    
    56 57
             String groupByValue = oldParentNode.getContext().getServicesProvider().getRootOpenableService().getGroupByValue(config.getGroupByName(), config.getGroupByFlavor(), newParentId);
    
    57 58
             @SuppressWarnings("unchecked") ParentNode newParentNode = (ParentNode) tree.getModel().getNodeFromPath(new String[]{groupByValue, newParentId}, true);
    
    58 59
             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 {
    156 156
                 bean.setObservationsComment(null);
    
    157 157
                 bean.setObservationsDataEntryOperator(null);
    
    158 158
                 bean.setObservationsDataQuality(null);
    
    159
    -//            bean.setObservationsProgram(null);
    
    159
    +            bean.setObservationsProgram(null);
    
    160 160
                 bean.setObserver(null);
    
    161 161
             } else {
    
    162 162
                 //FIXME Something to set by default ?
    
    ... ... @@ -171,6 +171,7 @@ public class TripUIModelStates extends GeneratedTripUIModelStates {
    171 171
                 bean.setFishingTime(null);
    
    172 172
                 bean.setDepartureWellContentStatus(null);
    
    173 173
                 bean.setLandingWellContentStatus(null);
    
    174
    +            bean.setLogbookProgram(null);
    
    174 175
             } else {
    
    175 176
                 if (bean.getDepartureWellContentStatus() == null) {
    
    176 177
                     bean.setDepartureWellContentStatus(defaultDepartureWellContentStatus);
    

  • pom.xml
    ... ... @@ -23,7 +23,7 @@
    23 23
       <parent>
    
    24 24
         <groupId>io.ultreia.maven</groupId>
    
    25 25
         <artifactId>pom</artifactId>
    
    26
    -    <version>2023.13</version>
    
    26
    +    <version>2023.15</version>
    
    27 27
       </parent>
    
    28 28
       <groupId>fr.ird.observe</groupId>
    
    29 29
       <artifactId>ird-observe</artifactId>