From 8d3356439efe726611016e6aef45f31b826ac18e Mon Sep 17 00:00:00 2001 From: Akanksha Mishra Date: Oct 23 2018 11:16:48 +0000 Subject: Allow filtering from milestones page Merges #3926 --- diff --git a/pagure/templates/_render_issues.html b/pagure/templates/_render_issues.html index c467807..95423fd 100644 --- a/pagure/templates/_render_issues.html +++ b/pagure/templates/_render_issues.html @@ -1,6 +1,6 @@ {% from "_projectstring.html" import projectstring, projecticon %} -{% macro render_issue_row(issue, repo, username, subtitle=True, class="", showproject=False, filterstatus=None) %} +{% macro render_issue_row(issue, repo, username, subtitle=True, class="", showproject=False, filterstatus=None, filtermilestone=None) %} {% if issue.status == 'Open' %} {% set status_color = "success" %} {% else %} @@ -57,6 +57,7 @@ username=username, namespace=repo.namespace, status=filterstatus, + milestone=filtermilestone, priority=issue.priority) }}" class="notblue"> {% endif %} {{ repo.priorities[issue.priority | string] }} @@ -75,6 +76,7 @@ username=username, namespace=repo.namespace, status=filterstatus, + milestone=filtermilestone, assignee=issue.assignee.username) }}" class="notblue"> {% endif %} {{ issue.assignee.username | avatar(size=20) | safe}} @@ -149,6 +151,7 @@ username=repo.username if repo.is_fork else None, namespace=repo.namespace, tags=tag.tag, + milestone=filtermilestone, status=filterstatus) }}"> {{ tag.tag }} diff --git a/pagure/templates/repo_milestone.html b/pagure/templates/repo_milestone.html index f775fed..b6bb410 100644 --- a/pagure/templates/repo_milestone.html +++ b/pagure/templates/repo_milestone.html @@ -58,7 +58,7 @@
Open Issues
{% for issue in open_issues %} - {{render_issue_row(issue, repo, username)}} + {{render_issue_row(issue, repo, username, filterstatus='All', filtermilestone=milestone)}} {% endfor %} {% endif %} {% if closed_issues %} @@ -66,7 +66,7 @@
Closed Issues
{% for issue in closed_issues %} - {{render_issue_row(issue, repo, username)}} + {{render_issue_row(issue, repo, username, filterstatus='All', filtermilestone=milestone)}} {% endfor %} {% endif %} {% endif %}