From d31ddad9643c91592eeada46c0ed72ae95d4816d Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Sat, 21 Dec 2019 14:11:17 +0500 Subject: [PATCH] upgrade django to 3.0.1 --- CLManager/models.py | 2 +- IncBackups/models.py | 6 +++--- cyberpanel.sh | 2 +- databases/models.py | 2 +- dockerManager/models.py | 2 +- loginSystem/models.py | 2 +- requirments.txt | 4 +++- websiteFunctions/models.py | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CLManager/models.py b/CLManager/models.py index 22cd0633f..ddb2740b5 100644 --- a/CLManager/models.py +++ b/CLManager/models.py @@ -7,7 +7,7 @@ # Create your models here. class CLPackages(models.Model): - owner = models.ForeignKey(Package) + owner = models.ForeignKey(Package, on_delete=models.CASCADE) name = models.CharField(max_length=50,unique=True) speed = models.CharField(max_length=50) vmem = models.CharField(max_length=50) diff --git a/IncBackups/models.py b/IncBackups/models.py index 2ed3f4492..f75aafaaf 100644 --- a/IncBackups/models.py +++ b/IncBackups/models.py @@ -5,11 +5,11 @@ from datetime import datetime class IncJob(models.Model): - website = models.ForeignKey(Websites) + website = models.ForeignKey(Websites, on_delete=models.CASCADE) date = models.DateTimeField(default=datetime.now, blank=True) class JobSnapshots(models.Model): - job = models.ForeignKey(IncJob) + job = models.ForeignKey(IncJob, on_delete=models.CASCADE) type = models.CharField(max_length=300) snapshotid = models.CharField(max_length=50) destination = models.CharField(max_length=200, default='') @@ -24,7 +24,7 @@ class BackupJob(models.Model): class JobSites(models.Model): - job = models.ForeignKey(BackupJob) + job = models.ForeignKey(BackupJob, on_delete=models.CASCADE) website = models.CharField(max_length=300) diff --git a/cyberpanel.sh b/cyberpanel.sh index 3bd5865e4..de3e93138 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -406,8 +406,8 @@ if [[ $DEV == "ON" ]] ; then fi if [[ $CENTOS_8 == "True" ]] ; then dnf install python3 -y - pip3.6 install virtualenv fi + pip3.6 install virtualenv fi fi diff --git a/databases/models.py b/databases/models.py index ec573f38a..c6c117d81 100755 --- a/databases/models.py +++ b/databases/models.py @@ -7,6 +7,6 @@ # Create your models here. class Databases(models.Model): - website = models.ForeignKey(Websites) + website = models.ForeignKey(Websites, on_delete=models.CASCADE) dbName = models.CharField(max_length=50,unique=True) dbUser = models.CharField(max_length=50) diff --git a/dockerManager/models.py b/dockerManager/models.py index 554a808e4..f1b895c95 100755 --- a/dockerManager/models.py +++ b/dockerManager/models.py @@ -8,7 +8,7 @@ class Containers(models.Model): name = models.CharField(max_length=50,unique=True) cid = models.CharField(max_length=64, default='') - admin = models.ForeignKey(Administrator) + admin = models.ForeignKey(Administrator, on_delete=models.CASCADE) image = models.CharField(max_length=50, default='unknown') tag = models.CharField(max_length=50, default='unknown') memory = models.IntegerField(default=0) diff --git a/loginSystem/models.py b/loginSystem/models.py index c63d999ca..8560e240b 100755 --- a/loginSystem/models.py +++ b/loginSystem/models.py @@ -88,7 +88,7 @@ class Administrator(models.Model): securityLevel = models.IntegerField(default=0) initWebsitesLimit = models.IntegerField(default=0) - acl = models.ForeignKey(ACL, default=1) + acl = models.ForeignKey(ACL, default=1, on_delete=models.PROTECT) diff --git a/requirments.txt b/requirments.txt index 2a9f230af..4b1b8bc45 100755 --- a/requirments.txt +++ b/requirments.txt @@ -1,4 +1,5 @@ acme==0.21.1 +asgiref==3.2.3 asn1crypto==0.24.0 Babel==0.9.6 backports.ssl-match-hostname==3.5.0.1 @@ -13,7 +14,7 @@ ConfigArgParse==0.15.2 configobj==5.0.6 cryptography==2.8 decorator==3.4.0 -Django==1.11 +Django==3.0.1 docker==3.6.0 docker-pycreds==0.4.0 docutils==0.14 @@ -54,6 +55,7 @@ requests-file==1.4.3 s3transfer==0.1.13 SimpleWebSocketServer==0.1.1 six==1.13.0 +sqlparse==0.3.0 tldextract==2.2.0 urllib3==1.22 websocket-client==0.56.0 diff --git a/websiteFunctions/models.py b/websiteFunctions/models.py index 36958a4a7..5858d842a 100755 --- a/websiteFunctions/models.py +++ b/websiteFunctions/models.py @@ -39,7 +39,7 @@ class dest(models.Model): class backupSchedules(models.Model): - dest = models.ForeignKey(dest) + dest = models.ForeignKey(dest, on_delete=models.CASCADE) frequency = models.CharField(max_length=15)