From 63cc336d6da09223c65417af43e71f07d2914a2f Mon Sep 17 00:00:00 2001 From: Norbert Csaba Herczeg Date: Tue, 12 Nov 2024 14:44:57 +0100 Subject: [PATCH] JNG-6009 readonly enum combo derived --- .../src/containers/View/Matter/Form/ViewMatterForm.tsx.snapshot | 1 + .../actor/src/containers/widget-fragments/enumerationcombo.hbs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/judo-ui-react-itest/ActionGroupTest/action_group_test__god/src/test/resources/snapshots/frontend-react/src/containers/View/Matter/Form/ViewMatterForm.tsx.snapshot b/judo-ui-react-itest/ActionGroupTest/action_group_test__god/src/test/resources/snapshots/frontend-react/src/containers/View/Matter/Form/ViewMatterForm.tsx.snapshot index 664c5d7b..d29a3ac1 100644 --- a/judo-ui-react-itest/ActionGroupTest/action_group_test__god/src/test/resources/snapshots/frontend-react/src/containers/View/Matter/Form/ViewMatterForm.tsx.snapshot +++ b/judo-ui-react-itest/ActionGroupTest/action_group_test__god/src/test/resources/snapshots/frontend-react/src/containers/View/Matter/Form/ViewMatterForm.tsx.snapshot @@ -142,6 +142,7 @@ export default function ViewMatterForm(props: ViewMatterFormProps) { disabled={actions?.isTypeDisabled ? actions.isTypeDisabled(data, editMode, isLoading) : isLoading} readOnly={ (actions?.isTypeReadonly ? actions.isTypeReadonly(data, editMode, isLoading) : false) || + false || !isFormUpdateable() } options={[ diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationcombo.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationcombo.hbs index e8981f2f..8c6ac594 100644 --- a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationcombo.hbs +++ b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/enumerationcombo.hbs @@ -16,7 +16,7 @@ autoHighlight value={data.{{ child.attributeType.name }} || null} disabled={actions?.is{{ firstToUpper child.attributeType.name }}Disabled ? actions.is{{ firstToUpper child.attributeType.name }}Disabled(data, editMode, isLoading) : ({{# if child.enabledBy }}!data.{{ child.enabledBy.name }} ||{{/ if }} isLoading)} - readOnly={(actions?.is{{ firstToUpper child.attributeType.name }}Readonly ? actions.is{{ firstToUpper child.attributeType.name }}Readonly(data, editMode, isLoading) : false) || !isFormUpdateable()} + readOnly={(actions?.is{{ firstToUpper child.attributeType.name }}Readonly ? actions.is{{ firstToUpper child.attributeType.name }}Readonly(data, editMode, isLoading) : false) || {{ boolValue child.attributeType.isReadOnly }} || !isFormUpdateable()} options={[ ...effective{{ firstToUpper child.attributeType.name }}Options.map((o) => ({ label: t(o.i18nKey, { defaultValue: o.i18nDefaultValue }),