+ You were added to this project {% if unit_email %} on behalf of {% else %} by {% endif %} {{displayed_sender}}. +
+
+ To list the files in this project, run:
+ dds ls -p {{project_id}}
+ To download all the files in this project to your current directory, run:
+ dds data get -p {{project_id}} -a --verify-checksum
+ For more information (including an installation guide), see the DDS CLI documentation here: scilifelabdatacentre.github.io/dds_cli.
++ {% if unit_email %} - You were added to this project on behalf of {{displayed_sender}} ({{unit_email}}). + If you experience issues, please contact the SciLifeLab unit {{displayed_sender}} at {{unit_email}}. {% else %} - You were added to this project by {{displayed_sender}}. + If you experience issues, please contact the SciLifeLab unit {{displayed_sender}}. {% endif %}
-- The DDS CLI command dds ls -p {{project_id}} can be used to list the files in this project.
-- The DDS CLI command dds data get -p {{project_id}} -a --verify-checksum can be used to download all the files in this project to your current directory.
-- Your access to this project will expire on {{deadline}}
+
+ Your access to this project will expire on:
{{deadline}}
- What is the DDS? The DDS is a system for SciLifeLab infrastructures to deliver data to researchers in a fast, secure and simple - way.
- + What is the DDS? The DDS is a system for SciLifeLab infrastructures to deliver data to researchers in a fast, secure and simple way. diff --git a/dds_web/templates/mail/project_release.txt b/dds_web/templates/mail/project_release.txt index 162f0a803..9b6dd9220 100644 --- a/dds_web/templates/mail/project_release.txt +++ b/dds_web/templates/mail/project_release.txt @@ -2,15 +2,21 @@ The following project is now available for your access in the SciLifeLab Data De - Project Title: {{project_title}} - DDS project ID: {{project_id}} -{% if unit_email %} -You were added to this project on behalf of {{displayed_sender}} ({{unit_email}}). -{% else %} -You were added to this project by {{displayed_sender}}. -{% endif %} +You were added to this project {% if unit_email %} on behalf of {% else %} by {% endif %} {{displayed_sender}}. -The DDS CLI command 'dds ls -p {{project_id}}' can be used to list the files in this project. +To list the files in this project, run: + dds ls -p {{project_id}} -The DDS CLI command 'dds data get -p {{project_id}} -a --verify-checksum' can be used to download all the files in this project to your current directory. +To download all the files in this project to your current directory, run: + dds data get -p {{project_id}} -a --verify-checksum. + +For more information (including an installation guide), see the DDS CLI documentation here: https://scilifelabdatacentre.github.io/dds_cli/ + +{% if unit_email %} +If you experience issues, please contact the SciLifeLab unit {{displayed_sender}} at {{unit_email}}. +{% else %} +If you experience issues, please contact the SciLifeLab unit {{displayed_sender}}. +{% endif %} Your access to this project will expire on {{deadline}} diff --git a/tests/api/test_project.py b/tests/api/test_project.py index 867da5ef3..7ac6ce020 100644 --- a/tests/api/test_project.py +++ b/tests/api/test_project.py @@ -1424,10 +1424,23 @@ def test_email_project_release(module_client, boto3_session): ## check plain text message assert f"- Project Title: {project_title}" in body assert f"- DDS project ID: {public_project_id}" in body + assert f"dds ls -p {public_project_id}" in body + assert f"dds data get -p {public_project_id} -a --verify-checksum" in body + assert "If you experience issues, please contact the SciLifeLab unit" in body + assert ( + "What is the DDS? The DDS is a system for SciLifeLab infrastructures to deliver data to researchers in a fast, secure and simple way" + in body + ) ## check html - assert f"