diff --git a/dashboard/src/views/domains.html b/dashboard/src/views/domains.html index cde7d045e..0db1cdb97 100644 --- a/dashboard/src/views/domains.html +++ b/dashboard/src/views/domains.html @@ -354,13 +354,13 @@

{{ 'domains.renewCerts.title' | tr }}
- @@ -397,7 +397,18 @@

{{ 'domains.syncDns.title' | tr }} - +

diff --git a/dashboard/src/views/domains.js b/dashboard/src/views/domains.js index 7c6c7f415..395ac8e0c 100644 --- a/dashboard/src/views/domains.js +++ b/dashboard/src/views/domains.js @@ -554,15 +554,17 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat message: '', errorMessage: '', taskId: '', + tasks: [], checkStatus: function () { - Client.getLatestTaskByType(TASK_TYPES.TASK_SYNC_DNS_RECORDS, function (error, task) { + Client.getTasksByType(TASK_TYPES.TASK_SYNC_DNS_RECORDS, function (error, tasks) { if (error) return console.error(error); - if (!task) return; + if (!tasks.length) return; - $scope.syncDns.taskId = task.id; - $scope.syncDns.updateStatus(); + $scope.syncDns.tasks = tasks.slice(0, 10); + + $scope.syncDns.taskId = tasks[0].id; }); }, @@ -576,6 +578,8 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat $scope.syncDns.percent = 100; // indicates that 'result' is valid $scope.syncDns.errorMessage = data.success ? '' : data.error.message; + $scope.syncDns.checkStatus(); + return; } @@ -601,6 +605,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat } else { $scope.syncDns.taskId = taskId; $scope.syncDns.updateStatus(); + $scope.syncDns.checkStatus(); } }); } @@ -740,6 +745,7 @@ angular.module('Application').controller('DomainsController', ['$scope', '$locat }); $scope.renewCerts.checkStatus(); + $scope.syncDns.checkStatus(); }); document.getElementById('gcdnsKeyFileInput').onchange = readFileLocally($scope.domainConfigure.gcdnsKey, 'content', 'keyFileName');