Merge pull request #164 from colab/Fix_collaboration_count

Fix collaboration graph count

colab/plugins/utils/collaborations.py

@@ -8,8 +8,7 @@
 from django.conf import settings
 
 from colab.plugins.utils.models import Collaboration
-from colab.super_archives.utils.collaborations import (get_visible_threads,
-                                                       count_threads)
+from colab.super_archives.utils.collaborations import (get_visible_threads)
 
 
 def get_collaboration_data(logged_user, filter_by_user=None):
@@ -20,13 +19,13 @@ def get_collaboration_data(logged_user, filter_by_user=None):
     latest_results = []
     populate_count_types = False
 
+    messages = get_visible_threads(logged_user, filter_by_user)
+
     if count_types is None:
         populate_count_types = True
         count_types = OrderedDict()
 
-        count_types[_('Emails')] = count_threads()
-
-    messages = get_visible_threads(logged_user, filter_by_user)
+        count_types[_('Emails')] = len(messages)
 
     latest_results.extend(messages)
 

colab/super_archives/tests/test_utils_collaborations.py

@@ -0,0 +1,12 @@
+# -*- coding:utf-8 -*-
+
+from django.test import TestCase
+from colab.super_archives.utils.collaborations import count_threads
+
+
+class CollaborationTest(TestCase):
+
+    fixtures = ['mailinglistdata.json']
+
+    def test_count_threads(self):
+        self.assertEquals(count_threads(), 5)