diff --git a/marlo-web/src/main/resources/custom/aicrra.properties b/marlo-web/src/main/resources/custom/aicrra.properties index 078eb8683b..4681537808 100644 --- a/marlo-web/src/main/resources/custom/aicrra.properties +++ b/marlo-web/src/main/resources/custom/aicrra.properties @@ -1930,7 +1930,7 @@ shfrmManagement.priorityActions.set=Set the control list for Priority Actions: shfrmManagement.priorityActions.title=Title shfrmManagement.priorityActions.description=Description shfrmManagement.priorityActions.add=Add new priority action -shfrmManagement.subActions.add=Add new sub-action +shfrmManagement.subActions.add=Add new sub-action(s) shfrmManagement.subActions.title=Title shfrmManagement.subActions.description=Description shfrmManagement.deliverables.info=See {0} deliverables attached 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 55b4aaa32e..083b53af2c 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 @@ -1579,8 +1579,8 @@
[#-- ${(shfrmPriorityActions[${priorityAction_index}].shfrmSubActions)![]} --] [#if priorityAction.shfrmSubActions?has_content] -
- [@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/] +
+ [@customForm.select name="" label="" i18nkey="deliverable.shfrmContribution.subAction.help" listName="shfrmPriorityActions[${priorityAction_index}].shfrmSubActions" keyFieldName="id" displayFieldName="name" multiple=false required=true className=" deliverableList" disabled=!editable/]
[/#if] @@ -1625,11 +1625,11 @@ [#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/] + [@customForm.select name="" label="" help="" helpIcon=false i18nkey="deliverable.shfrmContribution.subAction.help" listName="${name}.shfrmPriorityAction.shfrmSubActions" keyFieldName="id" displayFieldName="composedName" multiple=false required=true className=" deliverableList" disabled=!editable/]
[/#if] -
+
[#if element.shfrmSubActions?has_content] [#list (element.shfrmSubActions)![] as subActionListItem] [@subActionItemMacro subActionItem=subActionListItem name="${name}.shfrmSubActions" index=subActionListItem_index /] diff --git a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css index e26db7614a..dde3da5242 100644 --- a/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css +++ b/marlo-web/src/main/webapp/crp/css/projects/projectDeliverable.css @@ -27,6 +27,9 @@ body .WOS_tag p{ margin: 0px; width: 350px; } +.hideSelect{ + display: none; +} .loading-WOS-container{ display: flex; align-items: center; diff --git a/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableShfrm.js b/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableShfrm.js index f88ba358e0..db5e0c046a 100644 --- a/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableShfrm.js +++ b/marlo-web/src/main/webapp/crp/js/projects/deliverables/deliverableShfrm.js @@ -631,6 +631,7 @@ function addPartnerEvent(e) { function cloneSubActionSelect(value) { var $select = $(`#subactionSelect-${value}`).find('.baseselect').clone(true); + $select.removeClass('hideSelect'); return $select; }