taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug #88 (id 94): Added comments to the updated emails

remotes/origin/enhancement/email-actions
David Barragán Merino 2013-11-12 19:27:45 +01:00
parent 402f6c6e31
commit 0648d60178
11 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
greenmine/base/notifications/api.py
View File

@ -18,7 +18,8 @@ class NotificationSenderMixin(object):
super().post_save(obj, created)
users = obj.get_watchers_to_notify(self.request.user)
context = {'changer': self.request.user, 'object': obj}
comment = self.request.DATA.get("comment", None)
context = {'changer': self.request.user, "comment": comment, 'object': obj}
if created:
self._send_notification_email(self.create_notification_template,

5
greenmine/projects/issues/templates/emails/update_issue_notification-body-html.jinja
View File

@ -10,6 +10,10 @@
<h1>Project: {{ object.project.name }}</h1>
<h2>Issue #{{ object.ref }}: {{ object.subject }}</h2>
<p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
{% if comment %}
<p>Comment <b>{{ comment|linebreaksbr }}</b></p>
{% endif %}
{% if changed_fields %}
<p>Updated fields:
<dl>
{% for field in changed_fields %}
@ -28,6 +32,7 @@
{% endif %}
{% endfor %}
</dl>
{% endif %}
</td>
</tr>
</table>

9
greenmine/projects/issues/templates/emails/update_issue_notification-body-text.jinja
View File

@ -4,9 +4,14 @@
- Project: {{ object.project.name }}
- Issue #{{ object.ref }}: {{ object.subject }}
- Updated by {{ changer.get_full_name() }}
{% if comment %}
Comment: {{ comment|linebreaksbr }}
{% endif %}
{% if changed_fields %}
- Updated fields:
{% for field in changed_fields %}
{% for field in changed_fields %}
* {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
{% endfor %}
{% endfor %}
{% endif %}
** More info at {{ final_url_name }} ({{ final_url }}) **

5
greenmine/projects/milestones/templates/emails/update_milestone_notification-body-html.jinja
View File

@ -10,6 +10,10 @@
<h1>Project: {{ object.project.name }}</h1>
<h2>Milestone #{{ object.slug }}: {{ object.name }}</h2>
<p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
{% if comment %}
<p>Comment <b>{{ comment|linebreaksbr }}</b></p>
{% endif %}
{% if changed_fields %}
<p>Updated fields:
<dl>
{% for field in changed_fields %}
@ -28,6 +32,7 @@
{% endif %}
{% endfor %}
</dl>
{% endif %}
</td>
</tr>
</table>

9
greenmine/projects/milestones/templates/emails/update_milestone_notification-body-text.jinja
View File

@ -4,9 +4,14 @@
- Project: {{ object.project.name }}
- Milestone #{{ object.slug }}: {{ object.name }}
- Updated by {{ changer.get_full_name() }}
{% if comment %}
Comment: {{ comment|linebreaksbr }}
{% endif %}
{% if changed_fields %}
- Updated fields:
{% for field in changed_fields %}
{% for field in changed_fields %}
* {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
{% endfor %}
{% endfor %}
{% endif %}
** More info at {{ final_url_name }} ({{ final_url }}) **

5
greenmine/projects/tasks/templates/emails/update_task_notification-body-html.jinja
View File

@ -10,6 +10,10 @@
<h1>Project: {{ object.project.name }}</h1>
<h2>Task #{{ object.ref }}: {{ object.subject }}</h2>
<p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
{% if comment %}
<p>Comment <b>{{ comment|linebreaksbr }}</b></p>
{% endif %}
{% if changed_fields %}
<p>Updated fields:
<dl>
{% for field in changed_fields %}
@ -28,6 +32,7 @@
{% endif %}
{% endfor %}
</dl>
{% endif %}
</td>
</tr>
</table>

9
greenmine/projects/tasks/templates/emails/update_task_notification-body-text.jinja
View File

@ -4,9 +4,14 @@
- Project: {{ object.project.name }}
- Task #{{ object.ref }}: {{ object.subject }}
- Updated by {{ changer.get_full_name() }}
{% if comment %}
Comment: {{ comment|linebreaksbr }}
{% endif %}
{% if changed_fields %}
- Updated fields:
{% for field in changed_fields %}
{% for field in changed_fields %}
* {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
{% endfor %}
{% endfor %}
{% endif %}
** More info at {{ final_url_name }} ({{ final_url }}) **

5
greenmine/projects/templates/emails/update_project_notification-body-html.jinja
View File

@ -9,6 +9,10 @@
<td>
<h2>Project #{{ object.slug }}: {{ object.name }}</h2>
<p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
{% if comment %}
<p>Comment <b>{{ comment|linebreaksbr }}</b></p>
{% endif %}
{% if changed_fields %}
<p>Updated fields:
<dl>
{% for field in changed_fields %}
@ -27,6 +31,7 @@
{% endif %}
{% endfor %}
</dl>
{% endif %}
</td>
</tr>
</table>

9
greenmine/projects/templates/emails/update_project_notification-body-text.jinja
View File

@ -3,9 +3,14 @@
- Project #{{ object.slug }}: {{ object.name }}
- Updated by {{ changer.get_full_name() }}
{% if comment %}
Comment: {{ comment|linebreaksbr }}
{% endif %}
{% if changed_fields %}
- Updated fields:
{% for field in changed_fields %}
{% for field in changed_fields %}
* {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
{% endfor %}
{% endfor %}
{% endif %}
** More info at {{ final_url_name }} ({{ final_url }}) **

5
greenmine/projects/userstories/templates/emails/update_userstory_notification-body-html.jinja
View File

@ -10,6 +10,10 @@
<h1>Project: {{ object.project.name }}</h1>
<h2>US #{{ object.ref }}: {{ object.subject }}</h2>
<p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
{% if comment %}
<p>Comment <b>{{ comment|linebreaksbr }}</b></p>
{% endif %}
{% if changed_fields %}
<p>Updated fields:
<dl>
{% for field in changed_fields %}
@ -28,6 +32,7 @@
{% endif %}
{% endfor %}
</dl>
{% endif %}
</td>
</tr>
</table>

9
greenmine/projects/userstories/templates/emails/update_userstory_notification-body-text.jinja
View File

@ -4,9 +4,14 @@
- Project: {{ object.project.name }}
- US #{{ object.ref }}: {{ object.subject }}
- Updated by {{ changer.get_full_name() }}
{% if comment %}
Comment: {{ comment|linebreaksbr }}
{% endif %}
{% if changed_fields %}
- Updated fields:
{% for field in changed_fields %}
{% for field in changed_fields %}
* {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
{% endfor %}
{% endfor %}
{% endif %}
** More info at {{ final_url_name }} ({{ final_url }}) **