From c65ddc1d54281e0fb1deb87be7ad3a6d552a66b3 Mon Sep 17 00:00:00 2001
From: Alejandro Alonso <alejandroalonsofernandez@gmail.com>
Date: Thu, 5 Nov 2015 13:54:46 +0100
Subject: [PATCH] Not showing empty entries in timelines or activity tabs

---
 app/coffee/modules/common/history.coffee        | 17 +++++++++++------
 .../user-timeline/user-timeline.service.coffee  |  6 ++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/coffee/modules/common/history.coffee b/app/coffee/modules/common/history.coffee
index aa548c88..c28f6d96 100644
--- a/app/coffee/modules/common/history.coffee
+++ b/app/coffee/modules/common/history.coffee
@@ -29,9 +29,12 @@ module = angular.module("taigaCommon")
 IGNORED_FIELDS = {
     "userstories.userstory": [
         "watchers", "kanban_order", "backlog_order", "sprint_order", "finish_date"
-    ]
+    ],
     "tasks.task": [
         "watchers", "us_order", "taskboard_order"
+    ],
+    "issues.issue": [
+        "watchers"
     ]
 }
 
@@ -66,7 +69,13 @@ class HistoryController extends taiga.Controller
                 delete historyResult.values_diff.blocked_note_html
                 delete historyResult.values_diff.blocked_note_diff
 
-            @scope.history = history
+            for historyEntry in history
+                changeModel = historyEntry.key.split(":")[0]
+                if IGNORED_FIELDS[changeModel]?
+                    historyEntry.values_diff = _.removeKeys(historyEntry.values_diff, IGNORED_FIELDS[changeModel])
+
+            @scope.history = _.filter(history, (item) -> Object.keys(item.values_diff).length > 0)
+
             @scope.comments = _.filter(history, (item) -> item.comment != "")
 
     deleteComment: (type, objectId, activityId) ->
@@ -262,10 +271,6 @@ HistoryDirective = ($log, $loading, $qqueue, $template, $confirm, $translate, $c
                 return templateChangeGeneric({name:name, from:from, to: to})
 
         renderChangeEntries = (change) ->
-            changeModel = change.key.split(":")[0]
-            if IGNORED_FIELDS[changeModel]?
-                change.values_diff = _.removeKeys(change.values_diff, IGNORED_FIELDS[changeModel])
-
             return _.map(change.values_diff, (value, field) -> renderChangeEntry(field, value))
 
         renderChangesHelperText = (change) ->
diff --git a/app/modules/user-timeline/user-timeline/user-timeline.service.coffee b/app/modules/user-timeline/user-timeline/user-timeline.service.coffee
index b8e9b4c9..74d24ad1 100644
--- a/app/modules/user-timeline/user-timeline/user-timeline.service.coffee
+++ b/app/modules/user-timeline/user-timeline/user-timeline.service.coffee
@@ -66,6 +66,12 @@ class UserTimelineService extends taiga.Service
 
                 return false
         },
+        {# Empty change
+            check: (timeline) ->
+                event = timeline.get('event_type').split(".")
+                value_diff = timeline.get("data").get("value_diff")
+                return event[2] == 'change' and value_diff == undefined
+        },
         {# Deleted
             check: (timeline) ->
                 event = timeline.get('event_type').split(".")