diff --git a/apiserver/templates/emails/notifications/issue-updates.html b/apiserver/templates/emails/notifications/issue-updates.html index c1a48752fd..da61d891b8 100644 --- a/apiserver/templates/emails/notifications/issue-updates.html +++ b/apiserver/templates/emails/notifications/issue-updates.html @@ -1,243 +1,333 @@ -
- - -|
- |
-
|
- {{ issue.issue_identifier }} updates -{{workspace}}/{{project}}/{{issue.issue_identifier}}: {{ issue.name }} - |
-
{{summary}} {% if data|length > 0 %} {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name}} {% else %} {{ comments.0.actor_detail.first_name}} {{comments.0.actor_detail.last_name}} {% endif %} .
- {% else %} -{{summary}} {% if data|length > 0 %} {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name}} {% else %} {{ comments.0.actor_detail.first_name}} {{comments.0.actor_detail.last_name}} {% endif %} and others.
- {% endif %} {% for update in data %} {% if update.changes.name %} -The issue title has been updated to {{ issue.name}}
- {% endif %} {% if data %} -Updates
-
- {% if update.actor_detail.avatar_url %}
|
-
- {{ update.actor_detail.first_name }} {{ update.actor_detail.last_name }} - |
+
+
+
+
+
|
- {{ update.activity_time }} + |
-
| |
-
-
-
- Due Date: - |
-
- {% if update.changes.target_date.new_value.0 %}
- {{ update.changes.target_date.new_value.0 }} - {% else %} -{{ update.changes.target_date.old_value.0 }} - {% endif %} - |
-
| |
- {% if update.changes.duplicate.new_value.0 %}
- {% for duplicate in update.changes.duplicate.new_value|slice:":2" %} {{ duplicate }} {% endfor %} | - {% endif %} {% if update.changes.duplicate.new_value.2 %} -+{{ update.changes.duplicate.new_value|length|add:"-2" }} more | - {% endif %} {% if update.changes.duplicate.old_value.0 %} -{% for duplicate in update.changes.duplicate.old_value|slice:":2" %} {{ duplicate }} {% endfor %} | - {% endif %} {% if update.changes.duplicate.old_value.2 %} -+{{ update.changes.duplicate.old_value|length|add:"-2" }} more | - {% endif %} -
| |
- {% if update.changes.assignees.new_value.0 %} {{update.changes.assignees.new_value.0}} {% endif %} {% if update.changes.assignees.new_value.1 %} +{{ update.changes.assignees.new_value|length|add:"-1"}} more {% endif %} {% if update.changes.assignees.old_value.0 %} {{update.changes.assignees.old_value.0}} {% endif %} {% if update.changes.assignees.old_value.1 %} +{{ update.changes.assignees.old_value|length|add:"-1"}} more {% endif %} | -
| |
- {% if update.changes.labels.new_value.0 %} {{update.changes.labels.new_value.0}} {% endif %} {% if update.changes.labels.new_value.1 %} +{{ update.changes.labels.new_value|length|add:"-1"}} more {% endif %} {% if update.changes.labels.old_value.0 %} {{update.changes.labels.old_value.0}} {% endif %} {% if update.changes.labels.old_value.1 %} +{{ update.changes.labels.old_value|length|add:"-1"}} more {% endif %} | -
| |
-
- State: - |
- {% if update.changes.state.old_value.0 == 'Backlog' or update.changes.state.old_value.0 == 'In Progress' or update.changes.state.old_value.0 == 'Done' or update.changes.state.old_value.0 == 'Cancelled' %}
- |
- {% endif %}
-
- {{ update.changes.state.old_value.0 }} - |
- |
- {% if update.changes.state.new_value|last == 'Backlog' or update.changes.state.new_value|last == 'In Progress' or update.changes.state.new_value|last == 'Done' or update.changes.state.new_value|last == 'Cancelled' %}
- |
- {% endif %}
-
- {{update.changes.state.new_value|last }} - |
-
| |
-
- Links: - |
-
- {% for link in update.changes.link.new_value %} {{ link }} {% endfor %} {% if update.changes.link.old_value|length > 0 %} {% if update.changes.link.old_value.0 != "None" %}
- 2 Links were removed - {% endif %} {% endif %} - |
-
| |
-
- Priority: - |
-
- {{ update.changes.priority.old_value.0 }} - |
- |
-
- {{ update.changes.priority.new_value|last }} - |
-
| |
- {% if update.changes.blocking.new_value.0 %}
- {% for blocking in update.changes.blocking.new_value|slice:":2" %} {{ blocking }} {% endfor %} | - {% endif %} {% if update.changes.blocking.new_value.2 %} -+{{ update.changes.blocking.new_value|length|add:"-2" }} more | - {% endif %} {% if update.changes.blocking.old_value.0 %} -{% for blocking in update.changes.blocking.old_value|slice:":2" %} {{ blocking }} {% endfor %} | - {% endif %} {% if update.changes.blocking.old_value.2 %} -+{{ update.changes.blocking.old_value|length|add:"-2" }} more | - {% endif %} -
Comments
- {% for comment in comments %} -
- {% if comment.actor_detail.avatar_url %}
|
-
-
|
-
|
-
- This email was sent to {{ receiver.email }}. If you'd rather not receive this kind of email, you can unsubscribe to the issue or manage your email preferences.
-
+
+
+
+
+
-
+ {% if actors_involved == 1 %} + {{summary}} {% if data|length > 0 %} {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name}} {% else %} {{ comments.0.actor_detail.first_name}} {{comments.0.actor_detail.last_name}} {% endif %} . + {% else %} +{{summary}} {% if data|length > 0 %} {{ data.0.actor_detail.first_name}} {{data.0.actor_detail.last_name}} {% else %} {{ comments.0.actor_detail.first_name}} {{comments.0.actor_detail.last_name}} {% endif %} and others. + {% endif %} {% for update in data %} {% if update.changes.name %} +The issue title has been updated to {{ issue.name}} + {% endif %} {% if data %} +
+
+
+ {% endif %} {% endfor %} {% if comments.0 %}
+
+
+
+ Updates +
+
+
+
+
+
+ {% endif %}
Comments + {% for comment in comments %} +
|
-
|
+
+ This email was sent to {{ receiver.email }}. If you'd rather not receive this kind of email, you can unsubscribe to the issue or manage your email preferences.
+
+
+ |
+