+
@@ -435,13 +481,14 @@
Total Commits |
Branch |
Remote |
-
-
Manage |
+
Commits |
- | {$ totalCommits $} |
+
+ {$ totalCommits $}
+ |
|
- |
+
+
+ |
+
+
+
+
+
+
+
+ | Total Commits |
+ Branch |
+ Remote |
+ Commits |
+
+
+
+
+ |
+ {$ totalCommits $}
+ |
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+ |
diff --git a/websiteFunctions/urls.py b/websiteFunctions/urls.py
index 35966d5a9..bc39cf085 100755
--- a/websiteFunctions/urls.py
+++ b/websiteFunctions/urls.py
@@ -130,6 +130,8 @@ urlpatterns = [
url(r'^gitPush$', views.gitPush, name='gitPush'),
url(r'^attachRepoGIT$', views.attachRepoGIT, name='attachRepoGIT'),
url(r'^removeTracking$', views.removeTracking, name='removeTracking'),
+ url(r'^fetchGitignore$', views.fetchGitignore, name='fetchGitignore'),
+ url(r'^saveGitIgnore$', views.saveGitIgnore, name='saveGitIgnore'),
## Catch all for domains
diff --git a/websiteFunctions/views.py b/websiteFunctions/views.py
index c9a620d4f..5d52fdb02 100755
--- a/websiteFunctions/views.py
+++ b/websiteFunctions/views.py
@@ -803,5 +803,21 @@ def removeTracking(request):
userID = request.session['userID']
wm = WebsiteManager()
return wm.removeTracking(userID, json.loads(request.body))
+ except KeyError:
+ return redirect(loadLoginPage)
+
+def fetchGitignore(request):
+ try:
+ userID = request.session['userID']
+ wm = WebsiteManager()
+ return wm.fetchGitignore(userID, json.loads(request.body))
+ except KeyError:
+ return redirect(loadLoginPage)
+
+def saveGitIgnore(request):
+ try:
+ userID = request.session['userID']
+ wm = WebsiteManager()
+ return wm.saveGitIgnore(userID, json.loads(request.body))
except KeyError:
return redirect(loadLoginPage)
\ No newline at end of file
diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py
index 9666e6850..9823df22b 100755
--- a/websiteFunctions/website.py
+++ b/websiteFunctions/website.py
@@ -3150,6 +3150,12 @@ StrictHostKeyChecking no
else:
return ACLManager.loadErrorJson()
+
+ if self.branchName.find('*') > -1:
+ data_ret = {'status': 0, 'commandStatus': 'Already on this branch.', 'error_message': 'Already on this branch.'}
+ json_data = json.dumps(data_ret)
+ return HttpResponse(json_data)
+
## Check if remote exists
command = 'git -C %s checkout %s' % (self.folder, self.branchName.strip(' '))
@@ -3401,12 +3407,22 @@ StrictHostKeyChecking no
command = 'git config --global --unset core.sshCommand'
ProcessUtilities.executioner(command)
+ from filemanager.filemanager import FileManager
+
+ fm = FileManager(None, None)
+ fm.fixPermissions(self.domain)
+
data_ret = {'status': 1, 'commandStatus': commandStatus}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
else:
+ from filemanager.filemanager import FileManager
+
+ fm = FileManager(None, None)
+ fm.fixPermissions(self.domain)
+
command = 'git config --global --unset core.sshCommand'
ProcessUtilities.executioner(command)
@@ -3446,6 +3462,91 @@ 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 fetchGitignore(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()
+
+ command = 'cat %s/.gitignore' % (self.folder)
+ gitIgnoreContent = ProcessUtilities.outputExecutioner(command)
+
+ if gitIgnoreContent.find('No such file or directory') > -1:
+ gitIgnoreContent = 'File is currently empty.'
+
+ data_ret = {'status': 1, 'gitIgnoreContent': gitIgnoreContent}
+ 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 saveGitIgnore(self, userID=None, data=None):
+ try:
+
+ currentACL = ACLManager.loadedACL(userID)
+ admin = Administrator.objects.get(pk=userID)
+
+ self.domain = data['domain']
+ self.folder = data['folder']
+ self.gitIgnoreContent = data['gitIgnoreContent']
+
+ tempPath = "/home/cyberpanel/" + str(randint(1000, 9999))
+
+
+ if ACLManager.checkOwnership(self.domain, admin, currentACL) == 1:
+ pass
+ else:
+ return ACLManager.loadErrorJson('status', 0)
+
+ if self.folderCheck():
+ pass
+ else:
+ return ACLManager.loadErrorJson()
+
+ ## Write to temp file
+
+ writeToFile = open(tempPath, 'w')
+ writeToFile.write(self.gitIgnoreContent)
+ writeToFile.close()
+
+ ## Move to original file
+
+ command = 'mv %s %s/.gitignore' % (tempPath, self.folder)
+ ProcessUtilities.executioner(command)
+
+ ## Fix permissions
+
+ from filemanager.filemanager import FileManager
+
+ fm = FileManager(None, None)
+ fm.fixPermissions(self.domain)
+
+ data_ret = {'status': 1}
+ 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)