taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix closed us count in profile #1121

remotes/origin/4.0rc
Álex Hermida 2018-09-13 12:10:15 +02:00 committed by Alex Hermida
parent a577879ab3
commit ec245fe029
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
taiga/users/services.py
View File

@ -29,7 +29,7 @@ import zipfile
from django.apps import apps from django.apps import apps
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.core.files.storage import default_storage from django.core.files.storage import default_storage
from django.db.models import Q from django.db.models import OuterRef, Q, Subquery
from django.db import connection from django.db import connection
from django.conf import settings from django.conf import settings
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
@ -155,10 +155,14 @@ def get_stats_for_user(from_user, by_user):
.count() .count()
UserStory = apps.get_model('userstories', 'UserStory') UserStory = apps.get_model('userstories', 'UserStory')
assigned_users_ids = UserStory.objects.order_by().filter(
assigned_users__in=[from_user], id=OuterRef('pk')).values('pk')
total_num_closed_userstories = UserStory.objects.filter( total_num_closed_userstories = UserStory.objects.filter(
is_closed=True, is_closed=True,
project__id__in=project_ids, project__id__in=project_ids).filter(
assigned_to=from_user).count() Q(assigned_to=from_user) | Q(pk__in=Subquery(assigned_users_ids))).count()
project_stats = { project_stats = {
'total_num_projects': total_num_projects, 'total_num_projects': total_num_projects,