From 4236f50d06daea3ae974420ca41b53f0963ee932 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 31 2017 09:25:34 +0000 Subject: Do not display the close_status if there isn't one Fixes https://pagure.io/pagure/issue/2704 Signed-off-by: Pierre-Yves Chibon --- diff --git a/pagure/static/issue_ev.js b/pagure/static/issue_ev.js index eeca6de..1eb0afa 100644 --- a/pagure/static/issue_ev.js +++ b/pagure/static/issue_ev.js @@ -210,7 +210,11 @@ update_issue = function(data) { } else if (data.issue.status == 'Open'){ html = 'Open'; } else { - html = '' + data.issue.status + ' as: ' + data.issue.close_status + ''; + html = '' + data.issue.status + + ''; + if (data.issue.close_status) { + html += 'as: ' + data.issue.close_status + ''; + } } field.html(html); } else if (_f == 'title'){ diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html index 66a79d8..34c21e0 100644 --- a/pagure/templates/issue.html +++ b/pagure/templates/issue.html @@ -139,7 +139,7 @@ elif issue.status|lower == 'open' %}label-primary{% else %}label-info{% endif %}">{{ issue.status }} - {% if issue.status == 'Closed' %} + {% if issue.status == 'Closed' and issue.close_status %} as: {{ issue.close_status }}