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

Now issues filters are ordered by order and returned as a list of tuples

remotes/origin/enhancement/email-actions
Jesús Espino 2014-01-03 13:25:23 +01:00
parent 725bf978c1
commit 0575a80e7a
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
greenmine/projects/aggregates/filters.py
View File

@ -14,7 +14,7 @@ def _get_issues_tags(project):
cursor.execute(extra_sql, [project.id]) cursor.execute(extra_sql, [project.id])
rows = cursor.fetchall() rows = cursor.fetchall()
return dict(rows) return rows
def _get_issues_statuses(project): def _get_issues_statuses(project):
extra_sql = ("select status_id, count(status_id) from issues_issue " extra_sql = ("select status_id, count(status_id) from issues_issue "
@ -24,14 +24,14 @@ def _get_issues_statuses(project):
select id, (select count(*) from issues_issue select id, (select count(*) from issues_issue
where project_id = m.project_id and status_id = m.id) where project_id = m.project_id and status_id = m.id)
from projects_issuestatus as m from projects_issuestatus as m
where project_id = %s; where project_id = %s order by m.order;
""" """
with closing(connection.cursor()) as cursor: with closing(connection.cursor()) as cursor:
cursor.execute(extra_sql, [project.id]) cursor.execute(extra_sql, [project.id])
rows = cursor.fetchall() rows = cursor.fetchall()
return dict(rows) return rows
def _get_issues_priorities(project): def _get_issues_priorities(project):
@ -39,29 +39,28 @@ def _get_issues_priorities(project):
select id, (select count(*) from issues_issue select id, (select count(*) from issues_issue
where project_id = m.project_id and priority_id = m.id) where project_id = m.project_id and priority_id = m.id)
from projects_priority as m from projects_priority as m
where project_id = %s; where project_id = %s order by m.order;
""" """
with closing(connection.cursor()) as cursor: with closing(connection.cursor()) as cursor:
cursor.execute(extra_sql, [project.id]) cursor.execute(extra_sql, [project.id])
rows = cursor.fetchall() rows = cursor.fetchall()
return dict(rows) return rows
def _get_issues_types(project): def _get_issues_types(project):
extra_sql = """ extra_sql = """
select id, (select count(*) from issues_issue select id, (select count(*) from issues_issue
where project_id = m.project_id and type_id = m.id) where project_id = m.project_id and type_id = m.id)
from projects_issuetype as m from projects_issuetype as m
where project_id = %s; where project_id = %s order by m.order;
""" """
with closing(connection.cursor()) as cursor: with closing(connection.cursor()) as cursor:
cursor.execute(extra_sql, [project.id]) cursor.execute(extra_sql, [project.id])
rows = cursor.fetchall() rows = cursor.fetchall()
return dict(rows) return rows
def _get_issues_severities(project): def _get_issues_severities(project):
@ -69,14 +68,14 @@ def _get_issues_severities(project):
select id, (select count(*) from issues_issue select id, (select count(*) from issues_issue
where project_id = m.project_id and severity_id = m.id) where project_id = m.project_id and severity_id = m.id)
from projects_severity as m from projects_severity as m
where project_id = %s; where project_id = %s order by m.order;
""" """
with closing(connection.cursor()) as cursor: with closing(connection.cursor()) as cursor:
cursor.execute(extra_sql, [project.id]) cursor.execute(extra_sql, [project.id])
rows = cursor.fetchall() rows = cursor.fetchall()
return dict(rows) return rows
def _get_issues_assigned_to(project): def _get_issues_assigned_to(project):
@ -91,7 +90,7 @@ def _get_issues_assigned_to(project):
cursor.execute(extra_sql, [project.id]) cursor.execute(extra_sql, [project.id])
rows = cursor.fetchall() rows = cursor.fetchall()
return dict(rows) return rows
def _get_issues_owners(project): def _get_issues_owners(project):
@ -106,7 +105,7 @@ def _get_issues_owners(project):
cursor.execute(extra_sql, [project.id]) cursor.execute(extra_sql, [project.id])
rows = cursor.fetchall() rows = cursor.fetchall()
return dict(rows) return rows
def _get_issues_created_by(project): def _get_issues_created_by(project):
@ -121,7 +120,7 @@ def _get_issues_created_by(project):
cursor.execute(extra_sql, [project.id]) cursor.execute(extra_sql, [project.id])
rows = cursor.fetchall() rows = cursor.fetchall()
return dict(rows) return rows
def get_issues_filters_data(project): def get_issues_filters_data(project):