Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-07-04 12:58:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature: allow enforce disk limit via packages

Browse Source
This commit is contained in:
Usman Nasir
2021-04-05 15:07:17 +05:00
parent 5539049f94
commit 7fa4e03323
7 changed files with 68 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/packagesManager.py
View File

@@ -151,7 +151,7 @@ class PackagesManager:
data_ret = {'emails': emails, 'modifyStatus': 1, 'error_message': "None",
"diskSpace": diskSpace, "bandwidth": bandwidth, "ftpAccounts": ftpAccounts,
"dataBases": dataBases, "allowedDomains": modifyPack.allowedDomains, 'allowFullDomain': modifyPack.allowFullDomain}
"dataBases": dataBases, "allowedDomains": modifyPack.allowedDomains, 'allowFullDomain': modifyPack.allowFullDomain, 'enforceDiskLimits': modifyPack.enforceDiskLimits}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
@@ -193,6 +193,10 @@ class PackagesManager:
except:
modifyPack.allowFullDomain = 1
try:
modifyPack.enforceDiskLimits = int(data['enforceDiskLimits'])
except:
modifyPack.enforceDiskLimits = 0
modifyPack.save()
@@ -255,7 +259,8 @@ class PackagesManager:
'dataBases': items.dataBases,
'ftpAccounts': items.ftpAccounts,
'allowedDomains': items.allowedDomains,
'allowFullDomain': items.allowFullDomain
'allowFullDomain': items.allowFullDomain,
'enforceDiskLimits': items.enforceDiskLimits
}
if checker == 0:

25
packages/static/packages/packages.js
View File

@@ -197,7 +197,6 @@ app.controller('modifyPackages', function ($scope, $http) {
$("#successfullyModified").hide();
var packageName = $scope.packageToBeModified;
console.log(packageName);
url = "/packages/submitModify";
@@ -234,11 +233,8 @@ app.controller('modifyPackages', function ($scope, $http) {
$scope.emails = response.data.emails;
$scope.allowedDomains = response.data.allowedDomains;
if (response.data.allowFullDomain === 1) {
$scope.allowFullDomain = true;
} else {
$scope.allowFullDomain = false;
}
$scope.allowFullDomain = response.data.allowFullDomain === 1;
$scope.enforceDiskLimits = response.data.enforceDiskLimits === 1;
$scope.modifyButton = "Save Details";
@@ -260,7 +256,6 @@ app.controller('modifyPackages', function ($scope, $http) {
};
$scope.modifyPackageFunc = function () {
var packageName = $scope.packageToBeModified;
@@ -286,7 +281,8 @@ app.controller('modifyPackages', function ($scope, $http) {
dataBases: dataBases,
emails: emails,
allowedDomains: $scope.allowedDomains,
allowFullDomain: $scope.allowFullDomain
allowFullDomain: $scope.allowFullDomain,
enforceDiskLimits: $scope.enforceDiskLimits,
};
var config = {
@@ -446,7 +442,7 @@ app.controller('listPackageTables', function ($scope, $http) {
};
$scope.editInitial = function (package, diskSpace, bandwidth,
emailAccounts, dataBases, ftpAccounts, allowedDomains, allowFullDomain) {
emailAccounts, dataBases, ftpAccounts, allowedDomains, allowFullDomain, enforceDiskLimits) {
$scope.name = package;
$scope.diskSpace = diskSpace;
$scope.bandwidth = bandwidth;
@@ -455,12 +451,8 @@ app.controller('listPackageTables', function ($scope, $http) {
$scope.ftpAccounts = ftpAccounts;
$scope.allowedDomains = allowedDomains;
$scope.allowFullDomain = allowFullDomain;
if (allowFullDomain === 1) {
$scope.allowFullDomain = true;
} else {
$scope.allowFullDomain = false;
}
$scope.allowFullDomain = allowFullDomain === 1;
$scope.enforceDiskLimits = enforceDiskLimits === 1;
};
$scope.saveChanges = function () {
@@ -482,7 +474,8 @@ app.controller('listPackageTables', function ($scope, $http) {
dataBases: dataBases,
emails: emails,
allowedDomains: $scope.allowedDomains,
allowFullDomain: $scope.allowFullDomain
allowFullDomain: $scope.allowFullDomain,
enforceDiskLimits: $scope.enforceDiskLimits,
};
var config = {

9
packages/templates/packages/listPackages.html
View File

@@ -55,7 +55,7 @@
<td>
<a data-toggle="modal" data-target="#settings"
ng-click="editInitial(record.package, record.diskSpace, record.bandwidth,
record.emailAccounts, record.dataBases, record.ftpAccounts, record.allowedDomains, record.allowFullDomain)"
record.emailAccounts, record.dataBases, record.ftpAccounts, record.allowedDomains, record.allowFullDomain, record.enforceDiskLimits)"
class="btn btn-border btn-alt border-purple btn-link font-purple" href="#"
title=""><span>{% trans 'Edit' %}</span></a>
<a ng-click="deletePackageFinal(record.package)"
@@ -160,6 +160,13 @@
Child-Domains
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="$parent.enforceDiskLimits"
type="checkbox" value="">
Enforce Disk Limits
</label>
</div>
</div>
</div>
<hr>

6
packages/templates/packages/modifyPackage.html
View File

@@ -93,6 +93,12 @@
Allow Creation of Fully Qualified Domain as Child-Domains
</label>
</div>
<div class="checkbox">
<label>
<input ng-model="enforceDiskLimits" type="checkbox" value="">
Enforce Disk Limits
</label>
</div>
</div>
</div>