Merge Request #29

← To merge requests From remove_haystack into master
Merged
softwarepublico/colab!29
Created by Sergio Oliveira

Remove haystack

Assignee: None
Milestone: None

Merged by Sergio Oliveira

Source branch has been removed
Commits (9)
1 participants
    9fe63c7bd60deeb55e409a1d7dd173f5?s=40&d=identicon
    Show/hide discussion
    Sergio Oliveira started a discussion on the diff
    last updated by Sergio Oliveira
    colab/accounts/views.py
    70 68  
    71 69 count_types = OrderedDict()
    72 70  
    73   - fields_or_lookup = (
    74   - {'collaborators__contains': user.username},
    75   - {'fullname_and_username__contains': user.username},
    76   - )
      71 + # TODO: remove when mailman becomes a proxied plugin
      72 + messages = Message.objects.filter(from_address__user__pk=user.pk)
      73 + count_types[trans('thread')] = messages.count()
    77 74  
    78   - counter_class = {}
    79   - # {
    80   - # 'wiki': WikiCollabCount,
    81   - # 'ticket': TicketCollabCount,
    82   - # }
    1
    9fe63c7bd60deeb55e409a1d7dd173f5?s=40&d=identicon
    Show/hide discussion
    Sergio Oliveira started a discussion on the outdated diff
    last updated by Sergio Oliveira
    colab/home/views.py
    36   - # count_types['ticket'] = sum([
    37   - # ticket.count for ticket in TicketCollabCount.objects.all()
    38   - # ])
      19 + latest_results, count_types = getCollaborationData()
      20 + threads = Thread.objects.all()
      21 + messages = []
      22 + for t in threads:
      23 + messages.append(t.latest_message)
    39 24  
    40   - # count_types['wiki'] = sum([
    41   - # wiki.count for wiki in WikiCollabCount.objects.all()
    42   - # ])
    43   -
    44   - cache.set('home_chart', count_types)
      25 + latest_results.extend(messages)
      26 + latest_results = sorted(latest_results,
    1
    • 9fe63c7bd60deeb55e409a1d7dd173f5?s=40&d=identicon
      Link here  
      Sergio Oliveira @seocam

      O sorted cria uma nova lista. Neste caso o melhor seria usar o metodo sort da lista.

      Choose File ...   File name...
      Cancel
    9fe63c7bd60deeb55e409a1d7dd173f5?s=40&d=identicon
    Show/hide discussion
    Sergio Oliveira started a discussion on the outdated diff
    last updated by Sergio Oliveira
    colab/home/views.py
    40   - # count_types['wiki'] = sum([
    41   - # wiki.count for wiki in WikiCollabCount.objects.all()
    42   - # ])
    43   -
    44   - cache.set('home_chart', count_types)
      25 + latest_results.extend(messages)
      26 + latest_results = sorted(latest_results,
      27 + key=lambda elem: elem.modified, reverse=True)
    45 28  
    46 29 for key in count_types.keys():
    47 30 count_types[trans(key)] = count_types.pop(key)
    48 31  
    49 32 context = {
    50 33 'hottest_threads': hottest_threads[:6],
    51   - 'latest_threads': latest_threads,
      34 + 'latest_threads': latest_threads[:6],
    1
    • 9fe63c7bd60deeb55e409a1d7dd173f5?s=40&d=identicon
      Link here  
      Sergio Oliveira @seocam

      O latest_threads já tinha sido "sliced" no começo da view. Se quiserem manter o slice aqui não tem problema, neste caso apenas removam o primeiro slice.

      Choose File ...   File name...
      Cancel
    9fe63c7bd60deeb55e409a1d7dd173f5?s=40&d=identicon
    Show/hide discussion
    Sergio Oliveira started a discussion on the diff
    last updated by Sergio Oliveira
    colab/proxy/utils/models.py
      1 +from django.db import models
      2 +from django.conf import settings
      3 +from colab.accounts.models import User
      4 +
      5 +
      6 +class CollaborationModel(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 + @property
    1