Put altering of accepted suggestion in a separate timeline entry

translate · Apr 22, 2016 · c2d984e · c2d984e
1 parent 78b6482
commit c2d984e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/pootle/apps/pootle_store/unit/timeline.py b/pootle/apps/pootle_store/unit/timeline.py
@@ -291,7 +291,15 @@ def get_grouped_entries(self):
         grouped_entries = []
         grouped_timeline = groupby(
             self.submissions,
-            key=lambda x: ("%d\001%s" % (x['submitter_id'], x['creation_time'])))
+            key=lambda item: "\001".join([
+                str(x) for x in
+                [
+                    item['submitter_id'],
+                    item['creation_time'],
+                    item['suggestion_id'],
+                ]
+            ])
+        )
         # Group by submitter id and creation_time because
         # different submissions can have same creation time
         for key, values in grouped_timeline:

diff --git a/tests/views/timeline.py b/tests/views/timeline.py
@@ -123,7 +123,15 @@ def _calculate_timeline(request, unit):
 
     grouped_timeline = groupby(
         timeline.values(*timeline_fields),
-        key=lambda x: ("%d\001%s" % (x['submitter_id'], x['creation_time'])))
+        key=lambda item: "\001".join([
+            str(x) for x in
+            [
+                item['submitter_id'],
+                item['creation_time'],
+                item['suggestion_id'],
+            ]
+        ])
+    )
 
     # Group by submitter id and creation_time because
     # different submissions can have same creation time