Download as
Browse Code »

Commit 6f468f3b2a473ee454cb55e9b55bbb69d516bdc2

Authored by Sergio Oliveira
1 parent 477f37d2
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Adding new chart on user profile

Showing 2 changed files with 8 additions and 2 deletions   Show diff stats
src/accounts/templates/accounts/user_detail.html
  Diff comments   View file @6f468f3
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 {% block head_js %} 4 {% block head_js %}
5 {% include "pizza-chart.html" with chart_data=type_count chart_div="collabs" chart_height=300 %} 5 {% include "pizza-chart.html" with chart_data=type_count chart_div="collabs" chart_height=300 %}
6 - {% include "pizza-chart.html" with chart_div="collabs2" chart_height=300 %} 6 + {% include "pizza-chart.html" with chart_data=list_activity chart_div="collabs2" chart_height=300 %}
7 {% endblock %} 7 {% endblock %}
8 8
9 {% block main-content %} 9 {% block main-content %}
src/accounts/views.py
  Diff comments   View file @6f468f3
@@ -6,7 +6,7 @@ import datetime @@ -6,7 +6,7 @@ import datetime
6 from collections import OrderedDict 6 from collections import OrderedDict
7 7
8 from django.contrib import messages 8 from django.contrib import messages
9 - 9 +from django.db.models import Count
10 from django.contrib.auth import get_user_model 10 from django.contrib.auth import get_user_model
11 from django.views.generic import DetailView, UpdateView 11 from django.views.generic import DetailView, UpdateView
12 from django.utils import timezone 12 from django.utils import timezone
@@ -83,6 +83,12 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView): @@ -83,6 +83,12 @@ class UserProfileDetailView(UserProfileBaseMixin, DetailView):
83 query = query.order_by('-received_time') 83 query = query.order_by('-received_time')
84 context['emails'] = query[:10] 84 context['emails'] = query[:10]
85 85
  86 + count_by = 'thread__mailinglist__name'
  87 + messages = Message.objects.filter(from_address__user__pk=user.pk)
  88 + context['list_activity'] = dict(messages.values_list(count_by)\
  89 + .annotate(Count(count_by))\
  90 + .order_by(count_by))
  91 +
86 context.update(kwargs) 92 context.update(kwargs)
87 return super(UserProfileDetailView, self).get_context_data(**context) 93 return super(UserProfileDetailView, self).get_context_data(**context)
88 94