From eee8b80f9e86b2c3cf0d50dd8607cec806685e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 13 Nov 2013 12:12:27 +0100 Subject: [PATCH] Fixed a simple error on open status filtering --- greenmine/projects/aggregates/stats.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/greenmine/projects/aggregates/stats.py b/greenmine/projects/aggregates/stats.py index 9b8df8fe..97f53c6d 100644 --- a/greenmine/projects/aggregates/stats.py +++ b/greenmine/projects/aggregates/stats.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from django.db.models import Q, Count +from greenmine.projects.models import IssueStatus import datetime import copy @@ -142,9 +143,10 @@ def get_stats_for_project_issues(project): project_issues_stats['last_four_weeks_days']['by_open_closed']['closed'].append( project.issues.filter(finished_date__gte=day, finished_date__lt=next_day).count() ) - open_this_day = project.issues.filter(created_date__lt=next_day) + list_of_closed_status_ids = IssueStatus.objects.filter(is_closed=True).values('id') + open_this_day = project.issues.filter(status_id__in=list_of_closed_status_ids) + open_this_day = open_this_day.filter(created_date__lt=next_day) open_this_day = open_this_day.filter(Q(finished_date__gt=day) | Q(finished_date__isnull=True)) - open_this_day = open_this_day.filter(status__is_closed=False) for severity in project_issues_stats['last_four_weeks_days']['by_severity']: project_issues_stats['last_four_weeks_days']['by_severity'][severity]['data'].append( open_this_day.filter(severity_id=severity).count()