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

bug fix: see git file changes

Browse Source
This commit is contained in:
Usman Nasir
2021-12-26 15:30:33 +05:00
parent 31e059c3ca
commit cc3816d607
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
IncBackups/IncBackupsControl.py
View File

@@ -683,6 +683,7 @@ class IncJobs(multi.Thread):
except BaseException as msg: except BaseException as msg:
logging.statusWriter(self.statusPath, logging.statusWriter(self.statusPath,
'Failed to delete database: %s. [IncJobs.backupDatabases.456]' % str(msg), 1) 'Failed to delete database: %s. [IncJobs.backupDatabases.456]' % str(msg), 1)
return 1 return 1
except BaseException as msg: except BaseException as msg:
logging.statusWriter(self.statusPath, '%s. [IncJobs.backupDatabases.269][5009]' % str(msg), 1) logging.statusWriter(self.statusPath, '%s. [IncJobs.backupDatabases.269][5009]' % str(msg), 1)

4
websiteFunctions/templates/websiteFunctions/manageGIT.html
View File

@@ -862,9 +862,7 @@
<div class="col-sm-10" style="margin-bottom: 2%;"> <div class="col-sm-10" style="margin-bottom: 2%;">
<select ng-change="fetchChangesInFile()" <select ng-change="fetchChangesInFile()"
ng-model="$parent.changeFile" class="form-control"> ng-model="$parent.changeFile" class="form-control">
<option ng-repeat="file in files"> <option ng-repeat="file in files">{$ file $}</option>
{$ file $}
</option>
</select> </select>
</div> </div>

8
websiteFunctions/website.py
View File

@@ -3895,7 +3895,13 @@ StrictHostKeyChecking no
command = 'git -C %s diff-tree --no-commit-id --name-only -r %s' % (self.folder, self.commit) command = 'git -C %s diff-tree --no-commit-id --name-only -r %s' % (self.folder, self.commit)
files = ProcessUtilities.outputExecutioner(command, self.externalApp).split('\n') files = ProcessUtilities.outputExecutioner(command, self.externalApp).split('\n')
data_ret = {'status': 1, 'files': files} FinalFiles = []
for items in files:
if items != '':
FinalFiles.append(items.rstrip('\n').lstrip('\n'))
data_ret = {'status': 1, 'files': FinalFiles}
json_data = json.dumps(data_ret) json_data = json.dumps(data_ret)
return HttpResponse(json_data) return HttpResponse(json_data)