mirror of
https://github.com/usmannasir/cyberpanel.git
synced 2025-11-07 05:45:59 +01:00
bug fix: change package by owner
This commit is contained in:
@@ -177,6 +177,8 @@ class PackagesManager:
|
||||
userID = self.request.session['userID']
|
||||
currentACL = ACLManager.loadedACL(userID)
|
||||
|
||||
admin = Administrator.objects.get(pk=userID)
|
||||
|
||||
if ACLManager.currentContextPermission(currentACL, 'modifyPackage') == 0:
|
||||
return ACLManager.loadErrorJson('saveStatus', 0)
|
||||
|
||||
@@ -192,38 +194,44 @@ class PackagesManager:
|
||||
|
||||
modifyPack = Package.objects.get(packageName=packageName)
|
||||
|
||||
modifyPack.diskSpace = data['diskSpace']
|
||||
modifyPack.bandwidth = data['bandwidth']
|
||||
modifyPack.ftpAccounts = data['ftpAccounts']
|
||||
modifyPack.dataBases = data['dataBases']
|
||||
modifyPack.emailAccounts = data['emails']
|
||||
modifyPack.allowedDomains = data['allowedDomains']
|
||||
if modifyPack.admin == admin:
|
||||
|
||||
try:
|
||||
modifyPack.allowFullDomain = int(data['allowFullDomain'])
|
||||
except:
|
||||
modifyPack.allowFullDomain = 1
|
||||
modifyPack.diskSpace = data['diskSpace']
|
||||
modifyPack.bandwidth = data['bandwidth']
|
||||
modifyPack.ftpAccounts = data['ftpAccounts']
|
||||
modifyPack.dataBases = data['dataBases']
|
||||
modifyPack.emailAccounts = data['emails']
|
||||
modifyPack.allowedDomains = data['allowedDomains']
|
||||
|
||||
try:
|
||||
modifyPack.enforceDiskLimits = int(data['enforceDiskLimits'])
|
||||
except:
|
||||
modifyPack.enforceDiskLimits = 0
|
||||
try:
|
||||
modifyPack.allowFullDomain = int(data['allowFullDomain'])
|
||||
except:
|
||||
modifyPack.allowFullDomain = 1
|
||||
|
||||
modifyPack.save()
|
||||
try:
|
||||
modifyPack.enforceDiskLimits = int(data['enforceDiskLimits'])
|
||||
except:
|
||||
modifyPack.enforceDiskLimits = 0
|
||||
|
||||
## Fix https://github.com/usmannasir/cyberpanel/issues/998
|
||||
modifyPack.save()
|
||||
|
||||
# from plogical.IncScheduler import IncScheduler
|
||||
# isPU = IncScheduler('CalculateAndUpdateDiskUsage', {})
|
||||
# isPU.start()
|
||||
## Fix https://github.com/usmannasir/cyberpanel/issues/998
|
||||
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
command = '/usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/IncScheduler.py UpdateDiskUsageForce'
|
||||
ProcessUtilities.outputExecutioner(command)
|
||||
# from plogical.IncScheduler import IncScheduler
|
||||
# isPU = IncScheduler('CalculateAndUpdateDiskUsage', {})
|
||||
# isPU.start()
|
||||
|
||||
data_ret = {'status': 1, 'saveStatus': 1, 'error_message': "None"}
|
||||
json_data = json.dumps(data_ret)
|
||||
return HttpResponse(json_data)
|
||||
from plogical.processUtilities import ProcessUtilities
|
||||
command = '/usr/local/CyberCP/bin/python /usr/local/CyberCP/plogical/IncScheduler.py UpdateDiskUsageForce'
|
||||
ProcessUtilities.outputExecutioner(command)
|
||||
|
||||
data_ret = {'status': 1, 'saveStatus': 1, 'error_message': "None"}
|
||||
json_data = json.dumps(data_ret)
|
||||
return HttpResponse(json_data)
|
||||
else:
|
||||
data_ret = {'status': 0, 'saveStatus': 0, 'error_message': "You don't own this package."}
|
||||
json_data = json.dumps(data_ret)
|
||||
return HttpResponse(json_data)
|
||||
|
||||
except BaseException as msg:
|
||||
data_ret = {'status': 0, 'saveStatus': 0, 'error_message': str(msg)}
|
||||
|
||||
Reference in New Issue
Block a user