From 674902eb7d906af26208f7e1aa8dc2429bf82c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Tue, 7 Oct 2014 15:06:20 +0200
Subject: [PATCH] Fix bug #1186: Fixed emails sent when a wiki page is updated

---
 taiga/projects/history/models.py                      |  9 +++++++++
 .../templates/emails/includes/fields_diff-html.jinja  | 11 +++++++++--
 .../templates/emails/includes/fields_diff-text.jinja  |  4 +++-
 taiga/projects/history/templatetags/functions.py      |  1 +
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/taiga/projects/history/models.py b/taiga/projects/history/models.py
index 505a6730..9fa3deb5 100644
--- a/taiga/projects/history/models.py
+++ b/taiga/projects/history/models.py
@@ -111,6 +111,15 @@ class HistoryEntry(models.Model):
                 if description_diff:
                     key = "description_diff"
                     value = (None, description_diff)
+            elif key == "content":
+                content_diff = get_diff_of_htmls(
+                    self.diff[key][0],
+                    self.diff[key][1]
+                )
+
+                if content_diff:
+                    key = "content_diff"
+                    value = (None, content_diff)
             elif key in users_keys:
                 value = [resolve_value("users", x) for x in self.diff[key]]
             elif key == "watchers":
diff --git a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja
index be864da3..ebd2cce4 100644
--- a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja
+++ b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja
@@ -1,6 +1,8 @@
 {% set excluded_fields = [
     "description",
-    "description_html"
+    "description_html",
+    "content",
+    "content_html"
 ] %}
 
 <dl>
@@ -94,7 +96,12 @@
     {# DESCRIPTIONS #}
         {% elif field_name in ["description_diff"] %}
                 <dd style="background: #eee; padding: 5px 15px; color: #444">
-                    <b>to:</b> <i>{{ mdrender(object.project, values.1) }}</i>
+                    <b>diff:</b> <i>{{ mdrender(object.project, values.1) }}</i>
+                </dd>
+    {# CONTENT #}
+        {% elif field_name in ["content_diff"] %}
+                <dd style="background: #eee; padding: 5px 15px; color: #444">
+                    <b>diff:</b> <i>{{ mdrender(object.project, values.1) }}</i>
                 </dd>
     {# ASSIGNED TO #}
         {% elif field_name == "assigned_to" %}
diff --git a/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja b/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja
index c87e318a..71e6dbbe 100644
--- a/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja
+++ b/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja
@@ -1,6 +1,8 @@
 {% set excluded_fields = [
     "description_diff",
-    "description_html"
+    "description_html",
+    "content_diff",
+    "content_html"
 ] %}
 {% for field_name, values in changed_fields.items() %}
     {% if field_name not in excluded_fields %}
diff --git a/taiga/projects/history/templatetags/functions.py b/taiga/projects/history/templatetags/functions.py
index 07e7dcd3..c66ef67f 100644
--- a/taiga/projects/history/templatetags/functions.py
+++ b/taiga/projects/history/templatetags/functions.py
@@ -23,6 +23,7 @@ register = library.Library()
 
 EXTRA_FIELD_VERBOSE_NAMES = {
     "description_diff": _("description"),
+    "content_diff": _("content")
 }