diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 31d258b93..0945a6d9c 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -944,12 +944,15 @@ class Logbookadvanced extends CI_Controller { $this->load->model('logbookadvanced_model'); $result = $this->logbookadvanced_model->check_missing_dxcc_id($all); - header("Content-Type: application/json"); + $data['result'] = $result; + if ($all == 'false') { - echo json_encode(__("The number of QSOs updated for missing DXCC IDs was") .' ' . $result); + $data['message'] = __("The number of QSOs updated for missing DXCC IDs was") .' ' . $result; } else { - echo json_encode(__("The number of QSOs re-checked for DXCC was") .' ' . $result); + $data['message'] = __("The number of QSOs re-checked for DXCC was") .' ' . $result; } + header("Content-Type: application/json"); + echo json_encode($data); } public function openMissingDxccList() { diff --git a/assets/js/sections/logbookadvanced.js b/assets/js/sections/logbookadvanced.js index 11c70944d..1bd6e3c69 100644 --- a/assets/js/sections/logbookadvanced.js +++ b/assets/js/sections/logbookadvanced.js @@ -2258,8 +2258,12 @@ function saveOptions() { }, success: function(data) { $('#updateDxccBtn').prop("disabled", false).removeClass("running"); - $('.result').html(data); $('#closeButton').prop("disabled", false); + if (data.result == 0) { + $('.result').html(''); + return; + } + $('.result').html(''); }, error: function(xhr, status, error) { $('#updateDxccBtn').prop("disabled", false).removeClass("running"); @@ -2284,8 +2288,12 @@ function saveOptions() { }, success: function(data) { $('#fixMissingDxccBtn').prop("disabled", false).removeClass("running"); - $('.result').html(data); $('#closeButton').prop("disabled", false); + if (data.result == 0) { + $('.result').html(''); + return; + } + $('.result').html(''); }, error: function(xhr, status, error) { $('#fixMissingDxccBtn').prop("disabled", false).removeClass("running");