Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
110a9699
by Tony Chemit at 2020-12-12T23:48:12+01:00
-
3c13b948
by Tony Chemit at 2020-12-12T23:54:11+01:00
-
72e4001b
by Tony Chemit at 2020-12-12T23:54:24+01:00
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:
| ... | ... | @@ -100,8 +100,8 @@ |
| 100 | 100 |
}
|
| 101 | 101 |
|
| 102 | 102 |
.computedDataInformation {
|
| 103 |
- icon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-observe")};
|
|
| 104 |
- disabledIcon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-calcule")};
|
|
| 103 |
+ icon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-calcule")};
|
|
| 104 |
+ disabledIcon:{fr.ird.observe.client.util.UIHelper.getUIManagerActionIcon("data-observe")};
|
|
| 105 | 105 |
}
|
| 106 | 106 |
|
| 107 | 107 |
JToolBar {
|
| ... | ... | @@ -33,10 +33,6 @@ import fr.ird.observe.dto.data.DataDto; |
| 33 | 33 |
*/
|
| 34 | 34 |
public class ContentTableUINavigationContext extends NavigationContext<ContentTableUINavigationContext> {
|
| 35 | 35 |
|
| 36 |
- protected boolean computeShowSata(ContentTableUINavigationInitializer initializer) {
|
|
| 37 |
- return true;
|
|
| 38 |
- }
|
|
| 39 |
- |
|
| 40 | 36 |
public <D extends DataDto, C extends DataDto> ContentTableUIModelStates<D, C> newModelStates(ContentTableUINavigationInitializer initializer) {
|
| 41 | 37 |
return new ContentTableUIModelStates<>(newReferenceCache(), initializer.getScope().newMainBean(), initializer.getScope().newChildBean(), initializer.getSelectedId(), initializer.getScope().isStandalone());
|
| 42 | 38 |
}
|
| ... | ... | @@ -47,6 +47,9 @@ public abstract class ContentTableUINavigationHandler<N extends ContentTableUINa |
| 47 | 47 |
|
| 48 | 48 |
@Override
|
| 49 | 49 |
public Color getColor() {
|
| 50 |
+ if (!getNode().getInitializer().isShowData()) {
|
|
| 51 |
+ return Color.GRAY;
|
|
| 52 |
+ }
|
|
| 50 | 53 |
return super.getColor();
|
| 51 | 54 |
}
|
| 52 | 55 |
|