diff --git a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
index 76e5c686a6..55b4aaa32e 100644
--- a/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
+++ b/marlo-web/src/main/webapp/WEB-INF/global/macros/deliverableMacros.ftl
@@ -1551,7 +1551,7 @@
[@projectPartnerMacro element=priorityAction!{} name="deliverable.shfrmPriorityActions[${priorityAction_index}]" index=priorityAction_index opened=(deliverable.shfrmPriorityActions?size = 1)/]
[/#list]
[#else]
-
[#-- ${(shfrmPriorityActions[${priorityAction_index}].shfrmSubActions)![]} --]
[#if priorityAction.shfrmSubActions?has_content]
- [@customForm.select name="" label="" i18nkey="project.activities.deliverableSelect" listName="shfrmPriorityActions[${priorityAction_index}].shfrmSubActions" keyFieldName="id" displayFieldName="name" multiple=false required=true className=" deliverableList" disabled=!editable/]
+ [@customForm.select name="" label="" i18nkey="deliverable.shfrmContribution.subAction.help" listName="shfrmPriorityActions[${priorityAction_index}].shfrmSubActions" keyFieldName="id" displayFieldName="composedName" multiple=false required=true className=" deliverableList" disabled=!editable/]
[/#if]
@@ -1621,22 +1621,23 @@
+
+ [#if editable]
+ [#--
[@s.text name="shfrmManagement.subActions.add" /] [@customForm.req required=false /]
--]
+
+ [@customForm.select name="" label="" help="deliverable.shfrmContribution.subAction.help" helpIcon=false i18nkey="shfrmManagement.subActions.add" listName="${name}.shfrmPriorityAction.shfrmSubActions" keyFieldName="id" displayFieldName="composedName" multiple=false required=true className=" deliverableList" disabled=!editable/]
+
+ [/#if]
+
-
- [#if editable]
-
[@s.text name="shfrmManagement.subActions.add" /] [@customForm.req required=true /]
-
- [@customForm.select name="" label="" help="deliverable.shfrmContribution.subAction.help" helpIcon=false i18nkey="shfrmManagement.subActions.add" listName="${name}.shfrmPriorityAction.shfrmSubActions" keyFieldName="id" displayFieldName="composedName" multiple=false required=true className=" deliverableList" disabled=!editable/]
-
- [/#if]
@@ -1664,20 +1665,8 @@
-
In sua => Actions size: ${allSubActions?size}
-
-
- [#list allSubActions as ctrlistitemmmm]
-
* ctrl name: ${(ctrlistitemmmm.name)!'Empty name'} - id: ${(ctrlistitemmmm.id)!'Empty id'}
- [/#list]
-
-
-
[@customForm.elementsListComponent name="${name}.shfrmSubAction.id" elementType="shfrmSubAction" help="deliverable.shfrmContribution.subAction.help" helpIcon=false label="deliverable.shfrmContribution.subAction" elementList=shfrmSubAction listName="(element.deliverableShfrmPriorityAction.shfrmSubActions)![]" keyFieldName="id" displayFieldName="name" required=true /]
- [#--
- [@customForm.select name="${name}.shfrmSubAction.id" label="" i18nkey="deliverable.shfrmContribution.subAction" listName="(element.deliverableShfrmPriorityAction.shfrmSubActions)![]" keyFieldName="id" displayFieldName="name" multiple=false required=true className="countriesSelect" disabled=!editable/]
---]