Bug fix to API

CyberCP/settings.py

@@ -58,8 +58,8 @@ INSTALLED_APPS = [
     'manageSSL',
     'api',
     'filemanager',
+    'manageServices',
     'emailPremium',
-    'manageServices'
 ]
 
 MIDDLEWARE = [

baseTemplate/templates/baseTemplate/index.html

@@ -596,7 +596,6 @@
 
 <!-- WIDGETS -->
 
-
 <!-- Sparklines charts -->
 <script src="{% static 'baseTemplate/custom-js/pnotify.custom.min.js' %}"></script>
 <script src="{% static 'baseTemplate/custom-js/system-status.js' %}"></script>

manageServices/views.py

@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 
 from django.shortcuts import render
-from loginSystem.models import Administrator
 from django.shortcuts import HttpResponse, redirect
 import plogical.CyberCPLogFileWriter as logging
 from loginSystem.views import loadLoginPage

plogical/upgrade.py

@@ -530,7 +530,7 @@ WantedBy=multi-user.target"""
                 if items.find("'filemanager',") > -1:
                     writeToFile.writelines(items)
                     if Version.currentVersion == '1.6':
-                        writeToFile.writelines("    'emailPremium'\n")
+                        writeToFile.writelines("    'emailPremium',\n")
                 else:
                     writeToFile.writelines(items)
 

plogical/website.py

@@ -15,7 +15,7 @@ import subprocess
 import shlex
 from installUtilities import installUtilities
 from django.shortcuts import HttpResponse, render
-from loginSystem.models import Administrator
+from loginSystem.models import Administrator, ACL
 from packages.models import Package
 from mailUtilities import mailUtilities
 from random import randint
@@ -1920,10 +1920,11 @@ class WebsiteManager:
                     data['adminEmail'] = "usman@cyberpersons.com"
 
                 try:
+                    acl = ACL.objects.get(name='user')
                     websiteOwn = Administrator(userName=websiteOwner,
                                                password=hashPassword.hash_password(ownerPassword),
                                                email=adminEmail, type=3, owner=admin.pk,
-                                               initWebsitesLimit=1)
+                                               initWebsitesLimit=1, acl=acl)
                     websiteOwn.save()
                 except BaseException:
                     pass