Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-06 21:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix : https://github.com/usmannasir/cyberpanel/issues/329

Browse Source
This commit is contained in:
Usman Nasir
2020-05-07 17:15:31 +05:00
parent 5f589d0569
commit 97ae6eca28
3 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backup/backupManager.py
View File

@@ -1115,7 +1115,6 @@ class BackupManager:
time.sleep(3) time.sleep(3)
if os.path.isfile(backupLogPath):
command = "sudo cat " + backupLogPath command = "sudo cat " + backupLogPath
status = ProcessUtilities.outputExecutioner(command) status = ProcessUtilities.outputExecutioner(command)
@@ -1136,11 +1135,7 @@ class BackupManager:
data_ret = {'remoteTransferStatus': 1, 'error_message': "None", "status": status, "complete": 0} data_ret = {'remoteTransferStatus': 1, 'error_message': "None", "status": status, "complete": 0}
json_data = json.dumps(data_ret) json_data = json.dumps(data_ret)
return HttpResponse(json_data) return HttpResponse(json_data)
else:
data_ret = {'remoteTransferStatus': 0, 'error_message': "No such log found", "status": "None",
"complete": 0}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
except BaseException as msg: except BaseException as msg:
data = {'remoteTransferStatus': 0, 'error_message': str(msg), "status": "None", "complete": 0} data = {'remoteTransferStatus': 0, 'error_message': str(msg), "status": "None", "complete": 0}
json_data = json.dumps(data) json_data = json.dumps(data)

1
backup/static/backup/backup.js
View File

@@ -1347,6 +1347,7 @@ app.controller('remoteBackupControl', function ($scope, $http, $timeout) {
$http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
function ListInitialDatas(response) { function ListInitialDatas(response) {
$scope.backupProcessStarted = true;
if (response.data.remoteTransferStatus === 1) { if (response.data.remoteTransferStatus === 1) {

1
static/backup/backup.js
View File

@@ -1347,6 +1347,7 @@ app.controller('remoteBackupControl', function ($scope, $http, $timeout) {
$http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
function ListInitialDatas(response) { function ListInitialDatas(response) {
$scope.backupProcessStarted = true;
if (response.data.remoteTransferStatus === 1) { if (response.data.remoteTransferStatus === 1) {