diff --git a/pagure/templates/_render_issues.html b/pagure/templates/_render_issues.html index e24dcda..109660d 100644 --- a/pagure/templates/_render_issues.html +++ b/pagure/templates/_render_issues.html @@ -1,4 +1,4 @@ -{% macro render_issue_row(issue, repo, username, subtitle=True, class="", showproject=False) %} +{% macro render_issue_row(issue, repo, username, subtitle=True, class="", showproject=False, filterstatus=None) %} {% if issue.status == 'Open' %} {% set status_color = "success" %} {% else %} @@ -29,17 +29,56 @@ {% if issue.milestone %} - {{ issue.milestone }} + + + {% if filterstatus %} + + {% endif %} + {{ issue.milestone }} + {% if filterstatus %} + + {% endif %} + {% endif %} {% if issue.priority is not none %} - {{ repo.priorities[issue.priority | string] }} + + + {% if filterstatus %} + + {% endif %} + {{ repo.priorities[issue.priority | string] }} + {% if filterstatus %} + + {% endif %} + {% endif %} {% if issue.assignee %} + {% if filterstatus %} + + {% endif %} {{ issue.assignee.username | avatar(size=20) | safe}} + {% if filterstatus %} + + {% endif %} {% endif %} @@ -99,6 +138,7 @@
{% for tag in issue.tags %} + {% if filterstatus %} + tags=tag.tag, + status=filterstatus) }}"> {{ tag.tag }} + {% else %} + + {{ tag.tag }} + + {% endif %} {% endfor %}
{% endif %} diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html index a6c207d..7a720ca 100644 --- a/pagure/templates/issues.html +++ b/pagure/templates/issues.html @@ -451,7 +451,7 @@ {% if issues %} {% for issue in issues %} - {{render_issue_row(issue, repo, username)}} + {{render_issue_row(issue, repo, username, filterstatus=status)}} {% endfor %} {% else %}