Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 30d8a319 by Tony Chemit at 2020-05-21T08:11:32+02:00 La suppression d'une marée pourrait être permise même si le formulaire n'est pas parfaitement conforme - Closes #1482 - - - - - 3 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jcss - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jcss Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jcss ===================================== @@ -46,4 +46,5 @@ #delete { visible:{model.isUpdatingMode()}; + enabled:{!model.isModified()}; } ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUI.jcss ===================================== @@ -45,7 +45,7 @@ #delete { visible:{model.isUpdatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } #open { @@ -54,12 +54,12 @@ #close { visible:{model.isUpdatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } #create { visible:{!model.isCreatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } #extraActions { @@ -68,5 +68,5 @@ #move { visible:{model.isUpdatingMode()}; - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; + enabled:{!model.isModified()}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jcss ===================================== @@ -53,12 +53,10 @@ } #close { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; _toolTipText:{t("observe.data.ll.logbook.TripSampleList.action.close.tip")}; } #create { - enabled:{!model.isModified() && (model.isHistoricalData() || model.isValid())}; _text:{t("observe.data.ll.logbook.TripSampleList.action.create")}; _toolTipText:{t("observe.data.ll.logbook.TripSampleList.action.create.tip")}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/30d8a319bbb0c152c403167dec... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/30d8a319bbb0c152c403167dec... You're receiving this email because of your account on gitlab.com.