mirror
/
cyberpanel
mirror of https://github.com/usmannasir/cyberpanel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from jetchirag/master 

Fixed issue with controlling lsws from service page
This commit is contained in:
Usman Nasir 2018-05-28 16:39:44 +05:00 committed by GitHub
parent 01f46a86f3 381f5e0508
commit 04f89b92d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
serverStatus/static/serverStatus/serverStatus.js
View File

@ -377,7 +377,7 @@ app.controller('servicesManager', function($scope,$http) {
$scope.serviceAction = function(serviceName, action){
$scope.ActionProgress = true;
$scope.btnDisable = true;
$scope.ActionSuccessfull = false;
$scope.ActionSuccessful = false;
$scope.ActionFailed = false;
$scope.couldNotConnect = false;
$scope.actionLoader = true;
@ -403,32 +403,32 @@ app.controller('servicesManager', function($scope,$http) {
if(response.data.serviceAction == 1){
setTimeout(function() {
getServiceStatus();
setTimeout(function() {
$scope.ActionSuccessfull = true;
$scope.ActionFailed = false;
$scope.couldNotConnect = false;
$scope.actionLoader = false;
$scope.btnDisable = false;
},1000)
}, 3000);
//setTimeout(function() {
$scope.ActionSuccessful = true;
$scope.ActionFailed = false;
$scope.couldNotConnect = false;
$scope.actionLoader = false;
$scope.btnDisable = false;
//},1000)
}, 1000);
}
else{
setTimeout(function() {
getServiceStatus();
setTimeout(function() {
$scope.ActionSuccessfull = false;
//setTimeout(function() {
$scope.ActionSuccessful = false;
$scope.ActionFailed = true;
$scope.couldNotConnect = false;
$scope.actionLoader = false;
$scope.btnDisable = false;
},1000)
}, 5000);
//},1000)
}, 1000);
}
}
function cantLoadInitialDatas(response) {
$scope.ActionSuccessfull = false;
$scope.ActionSuccessful = false;
$scope.ActionFailed = false;
$scope.couldNotConnect = true;
$scope.actionLoader = false;

2
serverStatus/templates/serverStatus/services.html
View File

@ -130,7 +130,7 @@
<div ng-show="ActionFailed" class="alert alert-danger">
<p class="ng-binding">Action Failed</p>
</div>
<div ng-show="ActionSuccessfull" class="alert alert-success ng-hide">
<div ng-show="ActionSuccessful" class="alert alert-success ng-hide">
<p class="ng-binding">Action Completed</p>
</div>
<div ng-show="couldNotConnect" class="alert alert-danger ng-hide">

7
serverStatus/views.py
View File

@ -293,8 +293,11 @@ def servicesAction(request):
return HttpResponse(final_json)
else:
command = 'sudo systemctl %s %s' % (action, service)
if service == "lsws":
command = "sudo /usr/local/lsws/bin/lswsctrl %s" % (action)
else:
command = 'sudo systemctl %s %s' % (action, service)
cmd = shlex.split(command)
res = subprocess.call(cmd)