diff --git a/pagure/templates/issues.html b/pagure/templates/issues.html index 66b73ad..de15abe 100644 --- a/pagure/templates/issues.html +++ b/pagure/templates/issues.html @@ -12,9 +12,9 @@

{% if status|lower in ['open', 'true'] %} - {{ issues|count }} Open Issues (of {{ issues_cnt }}) + {{ issues|count }} Open Issues (of {{ total_issues_cnt }}) {% elif status|lower not in ['open', 'true', 'all', 'none'] %} - {{ issues|count }} Closed Issues (of {{ issues_cnt }}) + {{ issues|count }} Closed Issues (of {{ total_issues_cnt }}) {% else %} {{ issues|count }} Issues {% endif %} @@ -51,8 +51,8 @@ {% if oth_issues %}
{% if (issues | length + oth_issues) %} - - {{ (100.0 * (1 - issues_cnt / (issues_cnt + oth_issues)))|round|int }}% + + {{ (100.0 * (issues_cnt / total_issues_cnt))|round|int }}% {% endif %}
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index e611fc0..0e385c2 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -506,6 +506,9 @@ def view_issues(repo, username=None, namespace=None): status = None oth_issues = None + total_issues_cnt = pagure.lib.search_issues( + SESSION, repo, tags=tags, assignee=assignee, + author=author, private=private, priority=priority, count=True) if status is not None: issues = pagure.lib.search_issues( SESSION, @@ -557,9 +560,7 @@ def view_issues(repo, username=None, namespace=None): search_pattern=search_pattern, custom_search=custom_search, ) - issues_cnt = pagure.lib.search_issues( - SESSION, repo, tags=tags, assignee=assignee, - author=author, private=private, priority=priority, count=True) + issues_cnt = total_issues_cnt tag_list = pagure.lib.get_tags_of_project(SESSION, repo) @@ -574,6 +575,7 @@ def view_issues(repo, username=None, namespace=None): status=status, issues=issues, issues_cnt=issues_cnt, + total_issues_cnt=total_issues_cnt, oth_issues=oth_issues, tags=tags, assignee=assignee,