Fix bug #752: Show only description_diff in emails

taiga/mdrender/templatetags/functions.py

@@ -23,4 +23,6 @@ register = library.Library()
 
 @register.global_function
 def mdrender(project, text) -> str:
+    if text:
         return Markup(render(project, text))
+    return ""

taiga/projects/history/services.py

@@ -166,6 +166,7 @@ def make_diff(oldobj:FrozenObj, newobj:FrozenObj) -> FrozenDiff:
             diff["description"][0],
             diff["description"][1]
         )
+        if description_diff:
             diff["description_diff"] = (not_found_value, description_diff)
 
     return FrozenDiff(newobj.key, diff, newobj.snapshot)

taiga/projects/history/templates/emails/includes/fields_diff-html.jinja

@@ -1,10 +1,16 @@
+{% set excluded_fields = [
+    "description",
+    "description_html"
+] %}
+
 <dl>
 {% for field_name, values in changed_fields.items() %}
+    {% if field_name not in excluded_fields %}
         <dt style="background: #669933; padding: 5px 15px; color: #fff">
             <b>{{ verbose_name(object, field_name) }}</b>
         </dt>
 
-{# POINTS #}
+    {# POINTS #}
         {% if field_name == "points" %}
 
             {% for role, points in values.items() %}
@@ -19,7 +25,7 @@
                 </dd>
             {% endfor %}
 
-{# ATTACHMENTS #}
+    {# ATTACHMENTS #}
         {% elif field_name == "attachments" %}
 
             {% if values.new %}
@@ -65,7 +71,7 @@
                 {% endfor %}
             {% endif %}
 
-{# TAGS AND WATCHERS #}
+    {# TAGS AND WATCHERS #}
         {% elif field_name in ["tags", "watchers"] %}
 
             <dd style="background: #eee; padding: 5px 15px; color: #444">
@@ -78,28 +84,37 @@
             </dd>
             {% endif %}
 
-{# DESCRIPTIONS #}
+    {# DESCRIPTIONS #}
-    {% elif field_name in ["description"] %}
+        {% elif field_name in ["description_diff"] %}
-        {% if values.1 != None or values.1 != "" %}
                 <dd style="background: #eee; padding: 5px 15px; color: #444">
                     <b>to:</b> <i>{{ mdrender(object.project, values.1) }}</i>
                 </dd>
-        {% endif %}
+    {# ASSIGNED TO #}
-
+        {% elif field_name == "assigned_to" %}
-        {% if values.0 != None or values.0 != "" %}
+                <dd style="background: #eee; padding: 5px 15px; color: #444">
-            <dd style="padding: 5px 15px; color: #bbb">
+            {% if values.1 != None and values.1 != "" %}
-                <b>from:</b> <i>{{ mdrender(object.project, values.0) }}</i>
+                    <b>to:</b> <i>{{ values.1|linebreaksbr }}</i>
-            </dd>
-        {% endif %}
-{# * #}
             {% else %}
-        {% if values.1 != None or values.1 != "" %}
+                    <b>to:</b> <i>{{ _("Unassigned") }}</i>
+            {% endif %}
+                </dd>
+
+                <dd style="padding: 5px 15px; color: #bbb">
+            {% if values.0 != None and values.0 != "" %}
+                    <b>from:</b> <i>{{ values.0|linebreaksbr }}</i>
+            {% else %}
+                    <b>from:</b> <i>{{ _("Unassigned") }}</i>
+            {% endif %}
+                </dd>
+    {# * #}
+        {% else %}
+            {% if values.1 != None and values.1 != "" %}
                 <dd style="background: #eee; padding: 5px 15px; color: #444">
                     <b>to:</b> <i>{{ values.1|linebreaksbr }}</i>
                 </dd>
             {% endif %}
 
-        {% if values.0 != None or values.0 != "" %}
+            {% if values.0 != None and values.0 != "" %}
                 <dd style="padding: 5px 15px; color: #bbb">
                     <b>from:</b> <i>{{ values.0|linebreaksbr }}</i>
                 </dd>
@@ -107,5 +122,7 @@
 
         {% endif %}
 
+    {% endif %}
+
 {% endfor %}
 </dl>

taiga/projects/history/templates/emails/includes/fields_diff-text.jinja

@@ -1,11 +1,16 @@
+{% set excluded_fields = [
+    "description_diff",
+    "description_html"
+] %}
 {% for field_name, values in changed_fields.items() %}
+    {% if field_name not in excluded_fields %}
     - {{ verbose_name(object, field_name) }}:
-{# POINTS #}
+    {# POINTS #}
         {% if field_name == "points" %}
             {% for role, points in values.items() %}
         * {{ role }} to: {{ points.1|linebreaksbr }} from: {{ points.0|linebreaksbr }}
             {% endfor %}
-{# ATTACHMENTS #}
+    {# ATTACHMENTS #}
         {% elif field_name == "attachments" %}
             {% if values.new %}
         * {{ _("Added") }}:
@@ -27,19 +32,20 @@
             - {{ att.filename|linebreaksbr }}
                 {% endfor %}
             {% endif %}
-{# TAGS AND WATCHERS #}
+    {# TAGS AND WATCHERS #}
         {% elif field_name in ["tags", "watchers"] %}
     * to: {{ ', '.join(values.1)|linebreaksbr }}
             {% if values.0 %}
     * from: {{ ', '.join(values.0)|linebreaksbr }}
             {% endif %}
-{# * #}
+    {# * #}
         {% else %}
-        {% if values.1 != None or values.1 != "" %}
+            {% if values.1 != None and values.1 != "" %}
     * to: {{ values.1|linebreaksbr }}
             {% endif %}
-        {% if values.0 != None or values.0 != "" %}
+            {% if values.0 != None and values.0 != "" %}
     * from: {{ values.0|linebreaksbr }}
             {% endif %}
         {% endif %}
+    {% endif %}
 {% endfor %}

taiga/projects/history/templatetags/functions.py

@@ -14,13 +14,23 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from django.utils.translation import ugettext_lazy as _
+
 from django_jinja import library
 
 register = library.Library()
 
 
+EXTRA_FIELD_VERBOSE_NAMES = {
+    "description_diff": _("description"),
+}
+
+
 @register.global_function
 def verbose_name(obj:object, field_name:str) -> str:
+    if field_name in EXTRA_FIELD_VERBOSE_NAMES:
+        return EXTRA_FIELD_VERBOSE_NAMES[field_name]
+
     try:
         return obj._meta.get_field(field_name).verbose_name
     except Exception: