Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 110a9699 by Tony Chemit at 2020-12-12T23:48:12+01:00 Bien vérifier le fonctionnement des flags observe/calculé - Closes #1650 - - - - - 3c13b948 by Tony Chemit at 2020-12-12T23:54:11+01:00 Calée : racourcis inopportuns - Closes #1645 - - - - - 72e4001b by Tony Chemit at 2020-12-12T23:54:24+01:00 remove unused code - - - - - 3 changed files: - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationContext.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationHandler.java Changes: ===================================== client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss ===================================== @@ -100,8 +100,8 @@ } .computedDataInformation { - icon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-observe")}; - disabledIcon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-calcule")}; + icon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-calcule")}; + disabledIcon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-observe")}; } JToolBar { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationContext.java ===================================== @@ -33,10 +33,6 @@ import fr.ird.observe.dto.data.DataDto; */ public class ContentTableUINavigationContext extends NavigationContext<ContentTableUINavigationContext> { - protected boolean computeShowSata(ContentTableUINavigationInitializer initializer) { - return true; - } - public <D extends DataDto, C extends DataDto> ContentTableUIModelStates<D, C> newModelStates(ContentTableUINavigationInitializer initializer) { return new ContentTableUIModelStates<>(newReferenceCache(), initializer.getScope().newMainBean(), initializer.getScope().newChildBean(), initializer.getSelectedId(), initializer.getScope().isStandalone()); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/table/ContentTableUINavigationHandler.java ===================================== @@ -47,6 +47,9 @@ public abstract class ContentTableUINavigationHandler<N extends ContentTableUINa @Override public Color getColor() { + if (!getNode().getInitializer().isShowData()) { + return Color.GRAY; + } return super.getColor(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/27f807f4543bfedca1fbf08d2... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/27f807f4543bfedca1fbf08d2... You're receiving this email because of your account on gitlab.com.