From be5b21495af46909180d180840195e068547a6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Aragon=C3=A9s=20Muniesa?= <26822043+ivarmu@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:24:01 +0100 Subject: [PATCH] fix export issue with empty surveys (#63) --- changelogs/fragments/filetree_create_survey_issue.yaml | 4 ++++ roles/filetree_create/templates/controller_job_templates.j2 | 2 +- .../templates/controller_workflow_job_templates.j2 | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/filetree_create_survey_issue.yaml diff --git a/changelogs/fragments/filetree_create_survey_issue.yaml b/changelogs/fragments/filetree_create_survey_issue.yaml new file mode 100644 index 00000000..74faa205 --- /dev/null +++ b/changelogs/fragments/filetree_create_survey_issue.yaml @@ -0,0 +1,4 @@ +--- +bugfixes: + - filetree_create job_template and workflow_job_template survey was failing when it was empty +... diff --git a/roles/filetree_create/templates/controller_job_templates.j2 b/roles/filetree_create/templates/controller_job_templates.j2 index 94409305..eece005b 100644 --- a/roles/filetree_create/templates/controller_job_templates.j2 +++ b/roles/filetree_create/templates/controller_job_templates.j2 @@ -207,7 +207,7 @@ controller_templates: -%} {% if template_overrides_resources.job_template[current_job_templates_asset_value.name].survey_spec is defined or template_overrides_global.job_template.survey_spec is defined - or (current_job_templates_asset_value.related.survey_spec is defined and survey_spec_contents | length > 0) %} + or (current_job_templates_asset_value.related.survey_spec is defined and survey_spec_contents | length > 0 and survey_spec_contents | first | length > 0) %} survey_spec: {% for spec_item in survey_spec_contents %} name: "{{ spec_item.name }}" diff --git a/roles/filetree_create/templates/controller_workflow_job_templates.j2 b/roles/filetree_create/templates/controller_workflow_job_templates.j2 index aefcd85e..ae3aac2b 100644 --- a/roles/filetree_create/templates/controller_workflow_job_templates.j2 +++ b/roles/filetree_create/templates/controller_workflow_job_templates.j2 @@ -156,7 +156,7 @@ controller_workflows: -%} {% if template_overrides_resources.workflow_job_template[current_workflow_job_templates_asset_value.name].survey_spec is defined or template_overrides_global.workflow_job_template.survey_spec is defined - or (current_workflow_job_templates_asset_value.related.survey_spec is defined and survey_spec_contents | length > 0) %} + or (current_workflow_job_templates_asset_value.related.survey_spec is defined and survey_spec_contents | length > 0 and survey_spec_contents | first | length > 0) %} survey_spec: {% for spec_item in survey_spec_contents %} name: "{{ spec_item.name }}"