Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f3977cee by Tony Chemit at 2021-01-22T10:54:34+01:00 Petit défaut d'affichage d'une liste à choix multiple - Closes #1770 - - - - - 65848f2e by Tony Chemit at 2021-01-22T10:54:54+01:00 Tailles d'icônes différentes sur le même niveau de hiérarchie - Closes #1769 - - - - - 6 changed files: - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUINavigationNode.scope - client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUINavigationNode.scope - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/simple/GenerateContentSimpleUINavigationScope.java Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jaxx ===================================== @@ -231,9 +231,7 @@ <!-- predator --> <row> <cell columns="2" fill="both" weighty="0.7"> - <JScrollPane id='predatorPane'> - <DoubleList id='predator' genericType='SpeciesReference'/> - </JScrollPane> + <DoubleList id='predator' genericType='SpeciesReference'/> </cell> </row> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetCatchUI.jcss ===================================== @@ -63,12 +63,9 @@ title:"observe.data.ll.logbook.Catch.comment"; } -#predatorPane { - minimumSize:{new Dimension(10,150)}; -} - #predator { - showListLabel: true; + minimumSize:{new Dimension(10,150)}; + showListLabel: false; universeLabel:{t("observe.data.ll.logbook.Catch.availablePredator")}; selectedLabel:{t("observe.data.ll.logbook.Catch.selectedPredator")}; } ===================================== client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/logbook/SetGlobalCompositionUINavigationNode.scope ===================================== @@ -1,7 +1,8 @@ { "properties": { "model.permission": "WRITE_DATA", - "ui.iconPath": "navigation.ll.data.logbook.SetGlobalComposition" + "ui.iconPath": "navigation.ll.data.logbook.SetGlobalComposition", + "ui.subNode": "true" }, "i18nMapping": { "type": "observe.data.ll.logbook.SetGlobalComposition.type" ===================================== client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUINavigationNode.scope ===================================== @@ -1,7 +1,8 @@ { "properties": { "model.permission": "WRITE_DATA", - "ui.iconPath": "navigation.ll.data.observation.SetDetailComposition" + "ui.iconPath": "navigation.ll.data.observation.SetDetailComposition", + "ui.subNode": "true" }, "i18nMapping": { "type": "observe.data.ll.observation.SetDetailComposition.type" ===================================== client/datasource/editor/ll/src/main/resources/fr/ird/observe/client/datasource/editor/ll/data/observation/SetGlobalCompositionUINavigationNode.scope ===================================== @@ -1,7 +1,8 @@ { "properties": { "model.permission": "WRITE_DATA", - "ui.iconPath": "navigation.ll.data.observation.SetGlobalComposition" + "ui.iconPath": "navigation.ll.data.observation.SetGlobalComposition", + "ui.subNode": "true" }, "i18nMapping": { "type": "observe.data.ll.observation.SetGlobalComposition.type" ===================================== client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/data/simple/GenerateContentSimpleUINavigationScope.java ===================================== @@ -51,6 +51,7 @@ public class GenerateContentSimpleUINavigationScope extends GenerateContentSimpl String selectTypeName = generator.detectCapabilities.parentRelations.get(generator.packageName + "." + nodeType).replace(generator.packageName, generator.dtoPackage).replace("UINavigationNode", "Dto"); return newBuilder(contentUiType, nodeType) .setModule() + .setSubNode() .setDtoTypeFromNodeType() .setMainDtoTypeFromDtoType() .setDtoReferenceTypeFromMainDtoType() View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e473bd86fa64ad8cd31e53c2c... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/e473bd86fa64ad8cd31e53c2c... You're receiving this email because of your account on gitlab.com.