jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Update task status by id

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-12-08 20:21:11 -08:00
parent 970f7fe69b
commit a8d0e25866
3 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/settings.js
+15 -7
View File
@@ -60,9 +60,17 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
});
},
updateStatus: function () {
Client.getTaskProgress('update', function (error, data) {
if (error) return window.setTimeout($scope.update.updateStatus, 2000);
checkStatus: function () {
Client.getLatestTaskByType('update', function (error, taskId) {
if (error) return console.error(error);
$scope.update.updateStatus(taskId);
});
},
updateStatus: function (taskId) {
Client.getTask(taskId, function (error, data) {
if (error) return window.setTimeout($scope.update.updateStatus.bind(null, taskId), 2000);
if (!data.active) {
$scope.update.busy = false;
@@ -79,7 +87,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.update.percent = data.percent;
$scope.update.message = data.message;
window.setTimeout($scope.update.updateStatus, 500);
window.setTimeout($scope.update.updateStatus.bind(null, taskId), 500);
});
},
@@ -90,7 +98,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$scope.update.message = '';
$scope.update.errorMessage = '';
Client.update(function (error) {
Client.update(function (error, taskId) {
if (error) {
$scope.update.error.generic = error.message;
$scope.update.busy = false;
@@ -99,7 +107,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
$('#updateModal').modal('hide');
$scope.update.updateStatus();
$scope.update.updateStatus(taskId);
});
}
};
@@ -446,7 +454,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
Client.onReady(function () {
getAutoupdatePattern();
$scope.update.updateStatus();
$scope.update.checkStatus();
if ($scope.config.provider === 'caas') {
Client.getCaasConfig(function (error, caasConfig) {