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

view commits

Browse Source
This commit is contained in:
Usman Nasir
2020-03-12 18:56:28 +05:00
parent c254164475
commit 79d06972cf
6 changed files with 174 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
websiteFunctions/website.py
View File

@@ -2770,7 +2770,6 @@ StrictHostKeyChecking no
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
def syncToMaster(self, request=None, userID=None, data=None, childDomain = None):
try:
currentACL = ACLManager.loadedACL(userID)
@@ -2833,14 +2832,11 @@ StrictHostKeyChecking no
writeToFile.write(message)
writeToFile.close()
extraArgs['tempStatusPath'] = tempStatusPath
st = StagingSetup('startSyncing', extraArgs)
st.start()
data_ret = {'status': 1, 'error_message': 'None', 'tempStatusPath': tempStatusPath}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
@@ -3547,6 +3543,42 @@ StrictHostKeyChecking no
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
except BaseException as msg:
data_ret = {'status': 0, 'error_message': str(msg)}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
def fetchCommits(self, userID=None, data=None):
try:
currentACL = ACLManager.loadedACL(userID)
admin = Administrator.objects.get(pk=userID)
self.domain = data['domain']
self.folder = data['folder']
if ACLManager.checkOwnership(self.domain, admin, currentACL) == 1:
pass
else:
return ACLManager.loadErrorJson('status', 0)
if self.folderCheck():
pass
else:
return ACLManager.loadErrorJson()
initCommand = """log --pretty=format:'{%n "commit": "%h",%n "message": "%s", %n "name": "%cn", %n "date": "%cd"%n},' -10"""
command = 'git -C %s %s' % (self.folder, initCommand)
commits = '[%s]' % (ProcessUtilities.outputExecutioner(command).rstrip(','))
commits = json.loads(commits)
commits = json.dumps(commits)
data_ret = {'status': 1, 'commits': commits}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
except BaseException as msg:
data_ret = {'status': 0, 'error_message': str(msg)}
json_data = json.dumps(data_ret)