Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-05-07 08:56:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix to domain creation.

Browse Source
This commit is contained in:
usmannasir
2018-03-09 18:47:03 +05:00
parent 4a4873db7e
commit bf496020b2
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
websiteFunctions/templates/websiteFunctions/website.html
View File

@@ -251,10 +251,11 @@
<div style="border-radius: 25px;border-color:#3498db" class="content-box">
<h3 class="content-box-header bg-blue">
{% trans "Domains" %} <img ng-hide="domainLoading" src="/static/images/loading.gif">
</h3>
{% trans "Domains" %} <img ng-hide="domainLoading" src="/static/images/loading.gif">
</h3>
<div class="content-box-wrapper">
<div class="row">
<div class="col-md-4" style="margin-bottom: 2%;">
@@ -294,11 +295,10 @@
<!---------- HTML For creating domains --------------->
<div class="col-md-12">
<form id="domainCreationForm" name="websiteCreationForm" action="/" class="form-horizontal bordered-row">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
@@ -383,7 +383,8 @@
</div>
</form>
</form>
</div>
<!---------- HTML For creating domains --------------->
@@ -478,7 +479,7 @@
</div>
<!---------- HTML For Listing domains --------------->
</div>
</div>
</div>
</div>

6
websiteFunctions/views.py
View File

@@ -412,9 +412,11 @@ def submitDomainCreation(request):
####### Limitations check
master = Websites.objects.get(domain=masterDomain)
domainsInPackage = master.package.allowedDomains
if master.package.allowedDomains > master.childdomains_set.all().count():
if domainsInPackage == 0:
pass
elif domainsInPackage > master.childdomains_set.all().count():
pass
else:
data_ret = {"existsStatus": 0, 'createWebSiteStatus': 0,