Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
d6da558d
by Tony Chemit at 2024-04-24T09:40:22+02:00
-
61876197
by Tony Chemit at 2024-04-24T09:44:41+02:00
2 changed files:
- client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java
- toolkit/persistence/src/main/java/fr/ird/observe/spi/SqlConversions.java
Changes:
| ... | ... | @@ -80,7 +80,7 @@ public class ActivityUIModelStates extends GeneratedActivityUIModelStates { |
| 80 | 80 | this.pairingContext = SingletonSupplier.of(() -> {
|
| 81 | 81 | RoutePairingDto data = dataSource.getPsActivityPairingService().getRoutePairingDto(psModule.getCommonTrip().getId(), psModule.getLogbookRoute().getId());
|
| 82 | 82 | return data == null ? null : new RoutePairingEngine(data);
|
| 83 | - });
|
|
| 83 | + }, false);
|
|
| 84 | 84 | getBean().addPropertyChangeListener(evt -> {
|
| 85 | 85 | String propertyName = evt.getPropertyName();
|
| 86 | 86 | if (!isOpened()) {
|
| ... | ... | @@ -77,6 +77,8 @@ public class SqlConversions { |
| 77 | 77 | String stringValue;
|
| 78 | 78 | if (value == null) {
|
| 79 | 79 | stringValue = "NULL";
|
| 80 | + } else if (value instanceof Entity) {
|
|
| 81 | + stringValue = SqlHelper.escapeString(((Entity) value).getId());
|
|
| 80 | 82 | } else {
|
| 81 | 83 | Class<?> propertyType = sqlModelDescriptorTable.getSimplePropertiesType(propertyName);
|
| 82 | 84 | if (propertyType.equals(String.class)) {
|