diff --git a/greenmine/projects/tasks/templates/emails/create_task_notification-body-html.jinja b/greenmine/projects/tasks/templates/emails/create_task_notification-body-html.jinja index 0eda2fcb..aae3c925 100644 --- a/greenmine/projects/tasks/templates/emails/create_task_notification-body-html.jinja +++ b/greenmine/projects/tasks/templates/emails/create_task_notification-body-html.jinja @@ -1,2 +1,22 @@ -# TODO: {{ changer }} {{ object }} +{% extends "emails/base.jinja" %} + +{% set final_url = resolve_front_url("task", object.project.id, object.id) %} +{% set final_url_name = "Greenmine - View task #{0}".format(object.ref) %} + +{% block body %} + + + + +
+

Project: {{ object.project.name }}

+

Task #{{ object.ref }}: {{ object.subject }}

+

Created by {{ changer.get_full_name() }}.

+
+{% endblock %} +{% block footer %} +

+ More info at: {{ final_url_name }} +

+{% endblock %} diff --git a/greenmine/projects/tasks/templates/emails/create_task_notification-body-text.jinja b/greenmine/projects/tasks/templates/emails/create_task_notification-body-text.jinja index 0eda2fcb..22de5272 100644 --- a/greenmine/projects/tasks/templates/emails/create_task_notification-body-text.jinja +++ b/greenmine/projects/tasks/templates/emails/create_task_notification-body-text.jinja @@ -1,2 +1,8 @@ -# TODO: {{ changer }} {{ object }} +{% set final_url = resolve_front_url("task", object.project.id, object.id) %} +{% set final_url_name = "Greenmine - View task #{0}".format(object.ref) %} +- Project: {{ object.project.name }} +- Task #{{ object.ref }}: {{ object.subject }} +- Created by {{ changer.get_full_name() }} + +** More info at {{ final_url_name }} ({{ final_url }}) ** diff --git a/greenmine/projects/tasks/templates/emails/create_task_notification-subject.jinja b/greenmine/projects/tasks/templates/emails/create_task_notification-subject.jinja index bc4f47d6..c57a5def 100644 --- a/greenmine/projects/tasks/templates/emails/create_task_notification-subject.jinja +++ b/greenmine/projects/tasks/templates/emails/create_task_notification-subject.jinja @@ -1 +1 @@ -Create the new user story "{{ object }}" +[{{ object.project.name }}] Deleted the task #{{ object.ref }} "{{ object.subject }}" diff --git a/greenmine/projects/tasks/templates/emails/destroy_task_notification-body-html.jinja b/greenmine/projects/tasks/templates/emails/destroy_task_notification-body-html.jinja index 0eda2fcb..008ff424 100644 --- a/greenmine/projects/tasks/templates/emails/destroy_task_notification-body-html.jinja +++ b/greenmine/projects/tasks/templates/emails/destroy_task_notification-body-html.jinja @@ -1,2 +1,14 @@ -# TODO: {{ changer }} {{ object }} +{% extends "emails/base.jinja" %} + +{% block body %} + + + + +
+

{{ object.project.name }}

+

Task #{{ object.ref }}: {{ object.subject }}

+

Deleted by {{ changer.get_full_name() }}

+
+{% endblock %} diff --git a/greenmine/projects/tasks/templates/emails/destroy_task_notification-body-text.jinja b/greenmine/projects/tasks/templates/emails/destroy_task_notification-body-text.jinja index 0eda2fcb..22db8d90 100644 --- a/greenmine/projects/tasks/templates/emails/destroy_task_notification-body-text.jinja +++ b/greenmine/projects/tasks/templates/emails/destroy_task_notification-body-text.jinja @@ -1,2 +1,4 @@ -# TODO: {{ changer }} {{ object }} +- Project: {{ object.project.name }} +- Task #{{ object.ref }}: {{ object.subject }} +- Deleted by {{ changer.get_full_name() }} diff --git a/greenmine/projects/tasks/templates/emails/destroy_task_notification-subject.jinja b/greenmine/projects/tasks/templates/emails/destroy_task_notification-subject.jinja index 4c21e346..c57a5def 100644 --- a/greenmine/projects/tasks/templates/emails/destroy_task_notification-subject.jinja +++ b/greenmine/projects/tasks/templates/emails/destroy_task_notification-subject.jinja @@ -1,2 +1 @@ -Deleted the task "{{ object }}" - +[{{ object.project.name }}] Deleted the task #{{ object.ref }} "{{ object.subject }}" diff --git a/greenmine/projects/tasks/templates/emails/update_task_notification-body-html.jinja b/greenmine/projects/tasks/templates/emails/update_task_notification-body-html.jinja index e5708f8b..5fc31aa2 100644 --- a/greenmine/projects/tasks/templates/emails/update_task_notification-body-html.jinja +++ b/greenmine/projects/tasks/templates/emails/update_task_notification-body-html.jinja @@ -1,8 +1,40 @@ -

Updated fields by {{ changer }}:

- -{# TODO Print the "object" details #} +{% extends "emails/base.jinja" %} +{% set final_url = resolve_front_url("task", object.project.id, object.id) %} +{% set final_url_name = "Greenmine - View task #{0}".format(object.ref) %} + +{% block body %} + + + + +
+

Project: {{ object.project.name }}

+

Task #{{ object.ref }}: {{ object.subject }}

+

Updated by {{ changer.get_full_name() }}.

+

Updated fields: + {% for field in changed_fields_dict.values() %} + {{ field.verbose_name }}{% if not loop.last %},{% endif %} + {% endfor %} +

+ + {# TODO: Improvemments in some methods to use that: #} + {# - WatchedMixin._get_changed_field_old_value() #} + {# - WatchedMixin._get_changed_field_new_value() #} + {# +
    + {% for field in changed_fields_dict.values() %} +
  • + {{ field.verbose_name}}: from {{ field.old_value}} + to {{ field.new_value}}. +
  • + {% endfor %} +
+ #} +
+{% endblock %} +{% block footer %} +

+ More info at: {{ final_url_name }} +

+{% endblock %} diff --git a/greenmine/projects/tasks/templates/emails/update_task_notification-body-text.jinja b/greenmine/projects/tasks/templates/emails/update_task_notification-body-text.jinja index 9ac8d7b2..e3ccac9d 100644 --- a/greenmine/projects/tasks/templates/emails/update_task_notification-body-text.jinja +++ b/greenmine/projects/tasks/templates/emails/update_task_notification-body-text.jinja @@ -1,9 +1,21 @@ -Updated fields by {{ changer }}: +{% set final_url = resolve_front_url("task", object.project.id, object.id) %} +{% set final_url_name = "Greenmine - View task #{0}".format(object.ref) %} +- Project: {{ object.project.name }} +- Task #{{ object.ref }}: {{ object.subject }} +- Updated by {{ changer.get_full_name() }} +- Updated fields: {% for field in changed_fields_dict.values() %} - ** {{ field.verbose_name}}: from "{{ field.old_value}}" to "{{ field.new_value}}". + {{ field.verbose_name }}{% if not loop.last %}, {% endif %} {% endfor %} -{# TODO Print the "object" details #} - +{# TODO: Improvemments in some methods to use that: #} +{# - WatchedMixin._get_changed_field_old_value() #} +{# - WatchedMixin._get_changed_field_new_value() #} +{# +{% for field in changed_fields_dict.values() %} + * {{ field.verbose_name}}: from '{{ field.old_value}}' to '{{ field.new_value }}'. +{% endfor %} +#} +** More info at {{ final_url_name }} ({{ final_url }}) ** diff --git a/greenmine/projects/tasks/templates/emails/update_task_notification-subject.jinja b/greenmine/projects/tasks/templates/emails/update_task_notification-subject.jinja index 35ca5285..2d30bac7 100644 --- a/greenmine/projects/tasks/templates/emails/update_task_notification-subject.jinja +++ b/greenmine/projects/tasks/templates/emails/update_task_notification-subject.jinja @@ -1 +1 @@ -Updated the task "{{ object }}" +[{{ object.project.name }}] Updated the task #{{ object.ref }} "{{ object.subject }}"