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

bug fix: view commits

Browse Source
This commit is contained in:
Usman Nasir
2020-03-12 21:33:06 +05:00
parent 79d06972cf
commit 831e5bf193
4 changed files with 140 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
websiteFunctions/website.py
View File

@@ -3567,13 +3567,26 @@ StrictHostKeyChecking no
else:
return ACLManager.loadErrorJson()
initCommand = """log --pretty=format:'{%n "commit": "%h",%n "message": "%s", %n "name": "%cn", %n "date": "%cd"%n},' -10"""
initCommand = """log --pretty=format:"%h|%s|%cn|%cd" -50"""
command = 'git -C %s %s' % (self.folder, initCommand)
commits = '[%s]' % (ProcessUtilities.outputExecutioner(command).rstrip(','))
commits = ProcessUtilities.outputExecutioner(command).split('\n')
commits = json.loads(commits)
commits = json.dumps(commits)
json_data = "["
checker = 0
for commit in commits:
cm = commit.split('|')
dic = {'commit': cm[0], 'message': cm[1].replace('"', "'"), 'name': cm[2], 'date': cm[3]}
if checker == 0:
json_data = json_data + json.dumps(dic)
checker = 1
else:
json_data = json_data + ',' + json.dumps(dic)
commits = json_data + ']'
data_ret = {'status': 1, 'commits': commits}
json_data = json.dumps(data_ret)