diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index 64d737b..01ae02b 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -43,7 +43,7 @@
{% endif %}
@@ -765,6 +765,9 @@ function setup_reply_btns() {
var _obj = $('#pr_flags').find('tbody');
_obj.append($('| PR Status: | '+res.short_code+' |
'));
+ if (res.code == 'CONFLICTS' || res.code == 'NO_CHANGE') {
+ $('#merge_btn').attr("disabled", "disabled");
+ }
},
error: function(res) {
var _obj = $('#pr_flags').find('tbody');
@@ -777,6 +780,7 @@ function setup_reply_btns() {
$('| PR Status: | '
+ res.responseJSON.message +' |
'));
}
+ $('#merge_btn').attr("disabled", "disabled");
}
});
return false;