diff --git a/app/static/js/allPendingForms.js b/app/static/js/allPendingForms.js index fda836f0..b524ccaf 100644 --- a/app/static/js/allPendingForms.js +++ b/app/static/js/allPendingForms.js @@ -353,21 +353,24 @@ function clearTextArea() { //makes sure that it empties text areas and p tags wh -function loadOverloadModal(formHistoryID, laborStatusFormID) { +function loadOverloadModal(formHistoryID, laborStatusFormID) { /* This method sends an AJAX call to recieve data used to populate the overload modal. */ - $("#overloadModal").modal("show"); - $("#overloadModal").find('.modal-content').load('/admin/overloadModal/' + formHistoryID); + actionsButton = $("#menu" + formHistoryID); + actionsButton.prop('disabled', true); + actionsButton.html("Loading..."); + $("#overloadModal").find('.modal-content').load('/admin/overloadModal/' + formHistoryID, function() { + $("#overloadModal").modal("show"); + actionsButton.prop('disabled', false); + actionsButton.html("Actions "); + }); } function loadReleaseModal(formHistoryID, laborStatusFormID) { $("#modalRelease").modal("show"); - $("#modalRelease").find('.modal-content').load('/admin/releaseModal/' + formHistoryID); - - } diff --git a/app/templates/admin/allPendingForms.html b/app/templates/admin/allPendingForms.html index 5041dada..3c0b181f 100644 --- a/app/templates/admin/allPendingForms.html +++ b/app/templates/admin/allPendingForms.html @@ -202,11 +202,17 @@