From 6bca9d2c15c7fdf042aaad05806289cb2a09716b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 04 2016 10:24:25 +0000 Subject: Fix displaying why a PR cannot be merged Fixes https://pagure.io/pagure/issue/1366 --- diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html index 0dd83b9..86b622c 100644 --- a/pagure/templates/pull_request.html +++ b/pagure/templates/pull_request.html @@ -1034,16 +1034,7 @@ function setup_reply_btns() { {% if pull_request.status == 'Open' %} $(function(){ - $('#spinner').show(); - $.ajax({ - url: '{{ url_for("internal_ns.mergeable_request_pull") }}' , - type: 'POST', - data: { - requestid: "{{ pull_request.uid }}", - csrf_token: "{{ mergeform.csrf_token.current_token }}", - }, - dataType: 'json', - success: function(res) { + function process_response(res) { $('#spinner').hide(); if (res.code == 'FFORWARD'){ $('#merge_btn').addClass("btn-success"); @@ -1069,19 +1060,21 @@ function setup_reply_btns() { $('#merge-alert-message').append(res.message); $('#merge-alert').show(); } + }; + $('#spinner').show(); + $.ajax({ + url: '{{ url_for("internal_ns.mergeable_request_pull") }}' , + type: 'POST', + data: { + requestid: "{{ pull_request.uid }}", + csrf_token: "{{ mergeform.csrf_token.current_token }}", + }, + dataType: 'json', + success: function(res) { + process_response(res) }, error: function(res) { - $('#spinner').hide(); - var _obj = $('#pr_flags').find('tbody'); - if (res.responseJSON.message) { - _obj.append( - $('PR Status:'+ res.responseJSON.message +'')); - } else { - _obj.append( - $('PR Status:' - + res.responseJSON.message +'')); - } + process_response(res.responseJSON); $('#merge_btn').attr("disabled", "disabled"); } });