Merge branch 'master' of beta.softwarepublico.gov.br:softwarepublico/colab

Sergio Oliveira
2 parents 25aa2f67 d601d716
Showing 18 changed files with 299 additions and 130 deletions Show diff stats
colab/accounts/views.py
colab/home/views.py
colab/proxy/gitlab/data_api.py
colab/proxy/gitlab/models.py
colab/proxy/jenkins/data_api.py
colab/proxy/management/commands/import_proxy_data.py
colab/proxy/noosfero/data_api.py
colab/proxy/redmine/data_api.py
colab/proxy/trac/data_api.py
colab/proxy/trac/models.py
colab/proxy/utils/models.py
colab/proxy/utils/proxy_data_api.py
colab/search/templates/search/search-message-preview.html
colab/search/utils.py
colab/settings.py
colab/super_archives/views.py
tests/test_data.json
vagrant/provision.sh
-#!/usr/bin/env python
 # encoding: utf-8
-
 from collections import OrderedDict
-from haystack.exceptions import SearchBackendError
-
 from django.conf import settings
 from django.contrib import messages
 from django.db import transaction
@@ -18,15 +14,13 @@ from django.views.generic import DetailView, UpdateView, TemplateView
 from conversejs import xmpp
 from conversejs.models import XMPPAccount
-from haystack.query import SearchQuerySet
 from colab.super_archives.models import (EmailAddress, Message,
                                          EmailAddressValidation)
-from colab.search.utils import trans
-# from proxy.trac.models import WikiCollabCount, TicketCollabCount
+from colab.search.utils import get_collaboration_data
+
 from .forms import (UserCreationForm, UserForm, ListsForm,
                     UserUpdateForm, ChangeXMPPPasswordForm)
-# from .errors import XMPPChangePwdException
 from .utils import mailman
@@ -71,54 +65,21 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
         count_types = OrderedDict()
-        fields_or_lookup = (
-            {'collaborators__contains': user.username},
-            {'fullname_and_username__contains': user.username},
-        )
-
-        counter_class = {}
-        # {
-        #     'wiki': WikiCollabCount,
-        #     'ticket': TicketCollabCount,
-        # }
+        collaborations, count_types_extras = get_collaboration_data(user)
-        types = ['thread']
-        # types.extend(['ticket', 'wiki', 'changeset', 'attachment'])
+        collaborations.sort(key=lambda elem: elem.modified, reverse=True)
-        messages = Message.objects.filter(from_address__user__pk=user.pk)
-        for type in types:
-            CounterClass = counter_class.get(type)
-            if CounterClass:
-                try:
-                    counter = CounterClass.objects.get(author=user.username)
-                except CounterClass.DoesNotExist:
-                    count_types[trans(type)] = 0
-                else:
-                    count_types[trans(type)] = counter.count
-            elif type == 'thread':
-                count_types[trans(type)] = messages.count()
-            else:
-                sqs = SearchQuerySet()
-                for filter_or in fields_or_lookup:
-                    sqs = sqs.filter_or(type=type, **filter_or)
-                count_types[trans(type)] = sqs.count()
+        count_types.update(count_types_extras)
         context['type_count'] = count_types
-
-        sqs = SearchQuerySet()
-        for filter_or in fields_or_lookup:
-            sqs = sqs.filter_or(**filter_or).exclude(type='thread')
-
-        try:
-            context['results'] = sqs.order_by('-modified', '-created')[:10]
-        except SearchBackendError:
-            context['results'] = sqs.order_by('-modified')[:10]
+        context['results'] = collaborations[:10]
         email_pks = [addr.pk for addr in user.emails.iterator()]
         query = Message.objects.filter(from_address__in=email_pks)
         query = query.order_by('-received_time')
         context['emails'] = query[:10]
+        messages = Message.objects.filter(from_address__user__pk=user.pk)
         count_by = 'thread__mailinglist__name'
         context['list_activity'] = dict(messages.values_list(count_by)
                                                 .annotate(Count(count_by))
-
-from collections import OrderedDict
-
 from django.conf import settings
-from django.core.cache import cache
 from django.shortcuts import render
 from django.http import HttpResponse, Http404
-from haystack.query import SearchQuerySet
-
-# from proxy.trac.models import WikiCollabCount, TicketCollabCount
-from colab.search.utils import trans
+from colab.search.utils import get_collaboration_data
 from colab.super_archives.models import Thread
 def dashboard(request):
     """Dashboard page"""
+
+    highest_score_threads = Thread.highest_score.all()[:6]
+
+    hottest_threads = [t.latest_message for t in highest_score_threads]
+
     latest_threads = Thread.objects.all()[:6]
-    hottest_threads = Thread.highest_score.from_haystack()[:6]
-
-    count_types = cache.get('home_chart')
-    if count_types is None:
-        count_types = OrderedDict()
-        count_types['thread'] = SearchQuerySet().filter(
-            type='thread',
-        ).count()
-        # TODO: this section should be inside trac app and only use it here
-        # if settings.TRAC_ENABLED:
-        #     for type in ['changeset', 'attachment']:
-        #         count_types[type] = SearchQuerySet().filter(
-        #             type=type,
-        #         ).count()
-
-        #     count_types['ticket'] = sum([
-        #         ticket.count for ticket in TicketCollabCount.objects.all()
-        #     ])
-
-        #     count_types['wiki'] = sum([
-        #         wiki.count for wiki in WikiCollabCount.objects.all()
-        #     ])
-
-        cache.set('home_chart', count_types)
-
-    for key in count_types.keys():
-        count_types[trans(key)] = count_types.pop(key)
+
+    latest_results, count_types = get_collaboration_data()
+    latest_results.sort(key=lambda elem: elem.modified, reverse=True)
     context = {
         'hottest_threads': hottest_threads[:6],
         'latest_threads': latest_threads,
         'type_count': count_types,
-        'latest_results': SearchQuerySet().all().order_by(
-            '-modified', '-created'
-        )[:6],
+        'latest_results': latest_results[:6],
     }
     return render(request, 'home.html', context)
-
 import json
 import urllib
 import urllib2
@@ -58,7 +57,7 @@ class GitlabDataAPI(ProxyDataAPI):
         return projects
-    def fetchData(self):
+    def fetch_data(self):
         data = self.fetchProjects()
         for datum in data:
 from django.db import models
+from django.utils.translation import ugettext_lazy as _
 class GitlabProject(models.Model):
@@ -10,3 +11,7 @@ class GitlabProject(models.Model):
     name_with_namespace = models.TextField()
     created_at = models.DateTimeField(blank=True)
     last_activity_at = models.DateTimeField(blank=True)
+
+    class Meta:
+        verbose_name = _('Gitlab Project')
+        verbose_name_plural = _('Gitlab Projects')
@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI
 class JenkinsDataAPI(ProxyDataAPI):
-    def fetchData(self):
+    def fetch_data(self):
         pass
 #!/usr/bin/env python
 import importlib
+import inspect
 from django.core.management.base import BaseCommand
 from django.conf import settings
-from colab.proxy.proxybase.proxy_data_api import ProxyDataAPI
+from colab.proxy.utils.proxy_data_api import ProxyDataAPI
 class Command(BaseCommand):
@@ -20,7 +21,10 @@ class Command(BaseCommand):
             for module_item_name in dir(module):
                 module_item = getattr(module, module_item_name)
+                if not inspect.isclass(module_item):
+                    continue
                 if issubclass(module_item, ProxyDataAPI):
                     if module_item != ProxyDataAPI:
                         api = module_item()
-                        api.fetchData()
+                        api.fetch_data()
+                        break
@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI
 class NoosferoDataAPI(ProxyDataAPI):
-    def fetchData(self):
+    def fetch_data(self):
         pass
@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI
 class RedmineDataAPI(ProxyDataAPI):
-    def fetchData(self):
+    def fetch_data(self):
         pass
@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI
 class TracDataAPI(ProxyDataAPI):
-    def fetchData(self):
+    def fetch_data(self):
         pass
@@ -131,21 +131,3 @@ class Wiki(models.Model, HitCounterModelMixin):
             return User.objects.get(username=self.modified_by)
         except User.DoesNotExist:
             return None
-
-
-class WikiCollabCount(models.Model):
-    author = models.TextField(primary_key=True)
-    count = models.IntegerField()
-
-    class Meta:
-        managed = False
-        db_table = 'wiki_collab_count_view'
-
-
-class TicketCollabCount(models.Model):
-    author = models.TextField(primary_key=True)
-    count = models.IntegerField()
-
-    class Meta:
-        managed = False
-        db_table = 'ticket_collab_count_view'
@@ -0,0 +1,41 @@
+from django.db import models
+from django.conf import settings
+from colab.accounts.models import User
+
+
+class Collaboration(models.Model):
+    '''
+    Class to define the fields of the collaboration block
+        that are displayed at dashboard and profile pages.
+    '''
+
+    tag = None
+    title = None
+    description = None
+    url = None
+    modified = None
+    type = None
+
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True,
+                             on_delete=models.SET_NULL)
+
+    @property
+    def modified_by(self):
+        if self.user:
+            return self.user.get_full_name()
+        return None
+
+    @property
+    def modified_by_url(self):
+        if self.user:
+            return self.user.get_absolute_url()
+        return None
+
+    def update_user(self, user_name):
+        try:
+            self.user = User.objects.get(username=user_name)
+        except User.DoesNotExist:
+            self.user = None
+
+    class Meta:
+        abstract = True
@@ -2,5 +2,5 @@
 class ProxyDataAPI(object):
-    def fetchData(self):
+    def fetch_data(self):
         raise NotImplementedError('fetchData not yet implemented')
@@ -11,7 +11,6 @@
 <span class="subject">
   <a href="{{ result.url }}#msg-{{ result.pk }}"
     title="{% filter striptags|truncatewords:50 %}{{ result.description|escape }}{% endfilter %}">
-    {{ result.title }}
   </a>
 </span>
+import importlib
+import inspect
+from collections import OrderedDict
+
+from django.core.cache import cache
 from django.utils.translation import ugettext as _
+from django.conf import settings
+from colab.super_archives.models import Thread, Message
+from colab.proxy.utils.models import Collaboration
+
+
+def get_collaboration_data(filter_by_user=None):
+    latest_results = []
+    count_types = cache.get('home_chart')
+    populate_count_types = False
+
+    if count_types is None:
+        populate_count_types = True
+        count_types = OrderedDict()
+        count_types[_('Emails')] = Thread.objects.count()
+
+    if filter_by_user:
+        messages = Message.objects.filter(from_address__user__pk=filter_by_user.pk)
+    else:
+        latest_threads = Thread.objects.all()[:6]
+        messages = [t.latest_message for t in latest_threads]
+
+    latest_results.extend(messages)
+
+    app_names = settings.PROXIED_APPS.keys()
+
+    for app_name in app_names:
+        module = importlib \
+            .import_module('colab.proxy.{}.models'.format(app_name))
+
+        for module_item_name in dir(module):
+            module_item = getattr(module, module_item_name)
+            if not inspect.isclass(module_item):
+                continue
+            if not issubclass(module_item, Collaboration):
+                continue
+            if module_item == Collaboration:
+                continue
+
+            queryset = module_item.objects
+
+            if filter_by_user:
+                elements = queryset.filter(
+                    user__username=filter_by_user)
+            else:
+                elements = queryset.all()
+
+            latest_results.extend(elements)
+            elements_count = elements.count()
+
+            if elements_count > 1:
+                verbose_name = module_item._meta.verbose_name_plural.title()
+            else:
+                verbose_name = module_item._meta.verbose_name.title()
+            if populate_count_types:
+                count_types[verbose_name] = elements_count
-def trans(key):
-    translations = {
-        'wiki': _('Wiki'),
-        'thread': _('Emails'),
-        'changeset': _('Code'),
-        'ticket': _('Tickets'),
-        'attachment': _('Attachments'),
-    }
+    if populate_count_types:
+        cache.set('home_chart', count_types, 30)
-    return translations.get(key, key)
+    return latest_results, count_types
@@ -321,8 +321,9 @@ if FEEDZILLA_ENABLED:
         'common',
     )
-PROXIED_APPS = locals().get('PROXIED_APPS') or {}
 BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
+PROXIED_APPS = locals().get('PROXIED_APPS') or {}
+
 for app_label in PROXIED_APPS.keys():
     INSTALLED_APPS += ('colab.proxy.{}'.format(app_label),)
@@ -17,13 +17,11 @@ from django.utils.decorators import method_decorator
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render, redirect, get_object_or_404
-from haystack.query import SearchQuerySet
-
 from colab.accounts.utils import mailman
 from colab.accounts.models import User
 from .utils.email import send_verification_email
-from .models import MailingList, Thread, EmailAddress
-from .models import EmailAddressValidation, Message
+from .models import (MailingList, Thread, EmailAddress,
+                     EmailAddressValidation, Message)
 class ThreadView(View):
@@ -110,8 +108,9 @@ class ThreadView(View):
                     elif resp.status_code == 404:
                         error_msg = _('Mailing list does not exist')
                 else:
-                    error_msg = _('Unknown error\
-                                   trying to connect to Mailman API')
+                    error_msg = \
+                        _('Unknown error trying to connect to Mailman API')
+
             messages.error(request, error_msg)
         return self.get(request, mailinglist, thread_token)
@@ -126,7 +125,7 @@ class ThreadDashboardView(View):
         all_lists = mailman.all_lists(description=True)
         context['lists'] = []
-        # lists = MailingList.objects.filter()
+
         for list_ in MailingList.objects.order_by('name'):
             context['lists'].append((
                 list_.name,
@@ -134,7 +133,8 @@ class ThreadDashboardView(View):
                 list_.thread_set.filter(spam=False).order_by(
                     '-latest_message__received_time'
                 )[:MAX],
-                SearchQuerySet().filter(type='thread', tag=list_.name)[:MAX],
+                [t.latest_message for t in Thread.highest_score.filter(
+                    mailinglist__name=list_.name)[:MAX]],
                 len(mailman.list_users(list_.name)),
             ))
@@ -171,6 +171,7 @@ class EmailView(View):
         email.user = email_val.user
         email.save()
         email_val.delete()
+
         user = User.objects.get(username=email.user.username)
         user.is_active = True
         user.save()
@@ -0,0 +1,149 @@
+[
+{
+  "fields": {
+    "logo": "",
+    "description": "",
+    "last_imported_index": 0,
+    "name": "ListA",
+    "email": "listA@example.com"
+  },
+  "model": "super_archives.mailinglist",
+  "pk": 1
+},
+{
+  "fields": {
+    "logo": "",
+    "description": "",
+    "last_imported_index": 0,
+    "name": "ListB",
+    "email": "listB@example.com"
+  },
+  "model": "super_archives.mailinglist",
+  "pk": 2
+},
+{
+  "fields": {
+    "logo": "",
+    "description": "",
+    "last_imported_index": 0,
+    "name": "ListC",
+    "email": "listC@example.com"
+  },
+  "model": "super_archives.mailinglist",
+  "pk": 3
+},
+{
+  "fields": {
+    "spam": false,
+    "subject_token": "Thread_1_on_List_A",
+    "mailinglist": 1,
+    "score": 31,
+    "latest_message": 3
+  },
+  "model": "super_archives.thread",
+  "pk": 1
+},
+{
+  "fields": {
+    "spam": false,
+    "subject_token": "Thread_1_on_List_B",
+    "mailinglist": 2,
+    "score": 0,
+    "latest_message": 4
+  },
+  "model": "super_archives.thread",
+  "pk": 3
+},
+{
+  "fields": {
+    "spam": false,
+    "subject_token": "Thread_1_on_List_C",
+    "mailinglist": 3,
+    "score": 0,
+    "latest_message": 5
+  },
+  "model": "super_archives.thread",
+  "pk": 4
+},
+{
+  "fields": {
+    "body": "This is a repply to Thread 1 on list A",
+    "received_time": "2015-01-28T12:43:00.752Z",
+    "from_address": 1,
+    "thread": 1,
+    "spam": false,
+    "subject_clean": "Response to Thread 1A",
+    "message_id": "loreipsum",
+    "subject": "Response to Thread 1A"
+  },
+  "model": "super_archives.message",
+  "pk": 3
+},
+{
+  "fields": {
+    "body": "",
+    "received_time": "2015-01-28T12:57:22.180Z",
+    "from_address": 1,
+    "thread": 3,
+    "spam": false,
+    "subject_clean": "Message 1 on Thread 1B",
+    "message_id": "",
+    "subject": "Message 1 on Thread 1B"
+  },
+  "model": "super_archives.message",
+  "pk": 4
+},
+{
+  "fields": {
+    "body": "",
+    "received_time": "2015-01-28T13:02:12.903Z",
+    "from_address": 1,
+    "thread": 4,
+    "spam": false,
+    "subject_clean": "Message 1 on Thread 1C",
+    "message_id": "",
+    "subject": "Message 1 on Thread 1C"
+  },
+  "model": "super_archives.message",
+  "pk": 5
+},
+{
+  "fields": {
+    "last_name": "Administrator",
+    "webpage": "",
+    "twitter": "",
+    "is_staff": true,
+    "user_permissions": [],
+    "date_joined": "2015-01-28T12:34:58.770Z",
+    "google_talk": "",
+    "first_name": "Admin",
+    "is_superuser": true,
+    "last_login": "2015-01-28T12:35:39.621Z",
+    "verification_hash": null,
+    "role": "",
+    "email": "admin@mail.com",
+    "username": "admin",
+    "bio": "",
+    "needs_update": true,
+    "is_active": true,
+    "facebook": "",
+    "groups": [],
+    "password": "pbkdf2_sha256$12000$iiKCMnLZnFJw$UTx89LB8oYTiw9UqkcglzFLmIaZtbr+ZzF1cG3vfcyo=",
+    "institution": "",
+    "github": "",
+    "modified": "2015-01-28T12:45:27.375Z"
+  },
+  "model": "accounts.user",
+  "pk": 1
+},
+{
+  "fields": {
+    "real_name": "",
+    "user": 1,
+    "md5": "edb0e96701c209ab4b50211c856c50c4",
+    "address": "admin@mail.com"
+  },
+  "model": "super_archives.emailaddress",
+  "pk": 1
+}
+]
@@ -31,3 +31,4 @@ if [ ! -s /etc/colab/settings.yaml ]; then
 fi
 colab-admin migrate
+colab-admin loaddata /vagrant/tests/test_data.json
1	-#!/usr/bin/env python
2	# encoding: utf-8	1	# encoding: utf-8
3	-
4	from collections import OrderedDict	2	from collections import OrderedDict
5		3
6	-from haystack.exceptions import SearchBackendError
7	-
8	from django.conf import settings	4	from django.conf import settings
9	from django.contrib import messages	5	from django.contrib import messages
10	from django.db import transaction	6	from django.db import transaction
	@@ -18,15 +14,13 @@ from django.views.generic import DetailView, UpdateView, TemplateView		@@ -18,15 +14,13 @@ from django.views.generic import DetailView, UpdateView, TemplateView
18		14
19	from conversejs import xmpp	15	from conversejs import xmpp
20	from conversejs.models import XMPPAccount	16	from conversejs.models import XMPPAccount
21	-from haystack.query import SearchQuerySet
22		17
23	from colab.super_archives.models import (EmailAddress, Message,	18	from colab.super_archives.models import (EmailAddress, Message,
24	EmailAddressValidation)	19	EmailAddressValidation)
25	-from colab.search.utils import trans
26	-# from proxy.trac.models import WikiCollabCount, TicketCollabCount	20	+from colab.search.utils import get_collaboration_data
		21	+
27	from .forms import (UserCreationForm, UserForm, ListsForm,	22	from .forms import (UserCreationForm, UserForm, ListsForm,
28	UserUpdateForm, ChangeXMPPPasswordForm)	23	UserUpdateForm, ChangeXMPPPasswordForm)
29	-# from .errors import XMPPChangePwdException
30	from .utils import mailman	24	from .utils import mailman
31		25
32		26
	@@ -71,54 +65,21 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):		@@ -71,54 +65,21 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
71		65
72	count_types = OrderedDict()	66	count_types = OrderedDict()
73		67
74	- fields_or_lookup = (
75	- {'collaborators__contains': user.username},
76	- {'fullname_and_username__contains': user.username},
77	- )
78	-
79	- counter_class = {}
80	- # {
81	- # 'wiki': WikiCollabCount,
82	- # 'ticket': TicketCollabCount,
83	- # }	68	+ collaborations, count_types_extras = get_collaboration_data(user)
84		69
85	- types = ['thread']
86	- # types.extend(['ticket', 'wiki', 'changeset', 'attachment'])	70	+ collaborations.sort(key=lambda elem: elem.modified, reverse=True)
87		71
88	- messages = Message.objects.filter(from_address__user__pk=user.pk)
89	- for type in types:
90	- CounterClass = counter_class.get(type)
91	- if CounterClass:
92	- try:
93	- counter = CounterClass.objects.get(author=user.username)
94	- except CounterClass.DoesNotExist:
95	- count_types[trans(type)] = 0
96	- else:
97	- count_types[trans(type)] = counter.count
98	- elif type == 'thread':
99	- count_types[trans(type)] = messages.count()
100	- else:
101	- sqs = SearchQuerySet()
102	- for filter_or in fields_or_lookup:
103	- sqs = sqs.filter_or(type=type, **filter_or)
104	- count_types[trans(type)] = sqs.count()	72	+ count_types.update(count_types_extras)
105		73
106	context['type_count'] = count_types	74	context['type_count'] = count_types
107	-
108	- sqs = SearchQuerySet()
109	- for filter_or in fields_or_lookup:
110	- sqs = sqs.filter_or(**filter_or).exclude(type='thread')
111	-
112	- try:
113	- context['results'] = sqs.order_by('-modified', '-created')[:10]
114	- except SearchBackendError:
115	- context['results'] = sqs.order_by('-modified')[:10]	75	+ context['results'] = collaborations[:10]
116		76
117	email_pks = [addr.pk for addr in user.emails.iterator()]	77	email_pks = [addr.pk for addr in user.emails.iterator()]
118	query = Message.objects.filter(from_address__in=email_pks)	78	query = Message.objects.filter(from_address__in=email_pks)
119	query = query.order_by('-received_time')	79	query = query.order_by('-received_time')
120	context['emails'] = query[:10]	80	context['emails'] = query[:10]
121		81
		82	+ messages = Message.objects.filter(from_address__user__pk=user.pk)
122	count_by = 'thread__mailinglist__name'	83	count_by = 'thread__mailinglist__name'
123	context['list_activity'] = dict(messages.values_list(count_by)	84	context['list_activity'] = dict(messages.values_list(count_by)
124	.annotate(Count(count_by))	85	.annotate(Count(count_by))
1	-
2	-from collections import OrderedDict
3	-
4	from django.conf import settings	1	from django.conf import settings
5	-from django.core.cache import cache
6	from django.shortcuts import render	2	from django.shortcuts import render
7	from django.http import HttpResponse, Http404	3	from django.http import HttpResponse, Http404
8		4
9	-from haystack.query import SearchQuerySet
10	-
11	-# from proxy.trac.models import WikiCollabCount, TicketCollabCount
12	-from colab.search.utils import trans	5	+from colab.search.utils import get_collaboration_data
13	from colab.super_archives.models import Thread	6	from colab.super_archives.models import Thread
14		7
15		8
16	def dashboard(request):	9	def dashboard(request):
17	"""Dashboard page"""	10	"""Dashboard page"""
		11	+
		12	+ highest_score_threads = Thread.highest_score.all()[:6]
		13	+
		14	+ hottest_threads = [t.latest_message for t in highest_score_threads]
		15	+
18	latest_threads = Thread.objects.all()[:6]	16	latest_threads = Thread.objects.all()[:6]
19	- hottest_threads = Thread.highest_score.from_haystack()[:6]
20	-
21	- count_types = cache.get('home_chart')
22	- if count_types is None:
23	- count_types = OrderedDict()
24	- count_types['thread'] = SearchQuerySet().filter(
25	- type='thread',
26	- ).count()
27	- # TODO: this section should be inside trac app and only use it here
28	- # if settings.TRAC_ENABLED:
29	- # for type in ['changeset', 'attachment']:
30	- # count_types[type] = SearchQuerySet().filter(
31	- # type=type,
32	- # ).count()
33	-
34	- # count_types['ticket'] = sum([
35	- # ticket.count for ticket in TicketCollabCount.objects.all()
36	- # ])
37	-
38	- # count_types['wiki'] = sum([
39	- # wiki.count for wiki in WikiCollabCount.objects.all()
40	- # ])
41	-
42	- cache.set('home_chart', count_types)
43	-
44	- for key in count_types.keys():
45	- count_types[trans(key)] = count_types.pop(key)	17	+
		18	+ latest_results, count_types = get_collaboration_data()
		19	+ latest_results.sort(key=lambda elem: elem.modified, reverse=True)
46		20
47	context = {	21	context = {
48	'hottest_threads': hottest_threads[:6],	22	'hottest_threads': hottest_threads[:6],
49	'latest_threads': latest_threads,	23	'latest_threads': latest_threads,
50	'type_count': count_types,	24	'type_count': count_types,
51	- 'latest_results': SearchQuerySet().all().order_by(
52	- '-modified', '-created'
53	- )[:6],	25	+ 'latest_results': latest_results[:6],
54	}	26	}
55	return render(request, 'home.html', context)	27	return render(request, 'home.html', context)
56		28
	@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI		@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI
3		3
4	class JenkinsDataAPI(ProxyDataAPI):	4	class JenkinsDataAPI(ProxyDataAPI):
5		5
6	- def fetchData(self):	6	+ def fetch_data(self):
7	pass	7	pass
	@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI		@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI
3		3
4	class NoosferoDataAPI(ProxyDataAPI):	4	class NoosferoDataAPI(ProxyDataAPI):
5		5
6	- def fetchData(self):	6	+ def fetch_data(self):
7	pass	7	pass
	@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI		@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI
3		3
4	class RedmineDataAPI(ProxyDataAPI):	4	class RedmineDataAPI(ProxyDataAPI):
5		5
6	- def fetchData(self):	6	+ def fetch_data(self):
7	pass	7	pass
	@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI		@@ -3,5 +3,5 @@ from colab.proxy.utils.proxy_data_api import ProxyDataAPI
3		3
4	class TracDataAPI(ProxyDataAPI):	4	class TracDataAPI(ProxyDataAPI):
5		5
6	- def fetchData(self):	6	+ def fetch_data(self):
7	pass	7	pass
	@@ -131,21 +131,3 @@ class Wiki(models.Model, HitCounterModelMixin):		@@ -131,21 +131,3 @@ class Wiki(models.Model, HitCounterModelMixin):
131	return User.objects.get(username=self.modified_by)	131	return User.objects.get(username=self.modified_by)
132	except User.DoesNotExist:	132	except User.DoesNotExist:
133	return None	133	return None
134	-
135	-
136	-class WikiCollabCount(models.Model):
137	- author = models.TextField(primary_key=True)
138	- count = models.IntegerField()
139	-
140	- class Meta:
141	- managed = False
142	- db_table = 'wiki_collab_count_view'
143	-
144	-
145	-class TicketCollabCount(models.Model):
146	- author = models.TextField(primary_key=True)
147	- count = models.IntegerField()
148	-
149	- class Meta:
150	- managed = False
151	- db_table = 'ticket_collab_count_view'
@@ -0,0 +1,41 @@		@@ -0,0 +1,41 @@
	1	+from django.db import models
	2	+from django.conf import settings
	3	+from colab.accounts.models import User
	4	+
	5	+
	6	+class Collaboration(models.Model):
	7	+ '''
	8	+ Class to define the fields of the collaboration block
	9	+ that are displayed at dashboard and profile pages.
	10	+ '''
	11	+
	12	+ tag = None
	13	+ title = None
	14	+ description = None
	15	+ url = None
	16	+ modified = None
	17	+ type = None
	18	+
	19	+ user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True,
	20	+ on_delete=models.SET_NULL)
	21	+
	22	+ @property
	23	+ def modified_by(self):
	24	+ if self.user:
	25	+ return self.user.get_full_name()
	26	+ return None
	27	+
	28	+ @property
	29	+ def modified_by_url(self):
	30	+ if self.user:
	31	+ return self.user.get_absolute_url()
	32	+ return None
	33	+
	34	+ def update_user(self, user_name):
	35	+ try:
	36	+ self.user = User.objects.get(username=user_name)
	37	+ except User.DoesNotExist:
	38	+ self.user = None
	39	+
	40	+ class Meta:
	41	+ abstract = True
	@@ -2,5 +2,5 @@		@@ -2,5 +2,5 @@
2		2
3	class ProxyDataAPI(object):	3	class ProxyDataAPI(object):
4		4
5	- def fetchData(self):	5	+ def fetch_data(self):
6	raise NotImplementedError('fetchData not yet implemented')	6	raise NotImplementedError('fetchData not yet implemented')
	@@ -11,7 +11,6 @@		@@ -11,7 +11,6 @@
11	<span class="subject">	11	<span class="subject">
12	<a href="{{ result.url }}#msg-{{ result.pk }}"	12	<a href="{{ result.url }}#msg-{{ result.pk }}"
13	title="{% filter striptags\|truncatewords:50 %}{{ result.description\|escape }}{% endfilter %}">	13	title="{% filter striptags\|truncatewords:50 %}{{ result.description\|escape }}{% endfilter %}">
14	- {{ result.title }}
15	</a>	14	</a>
16	</span>	15	</span>
17		16