Skip to content

Commit

Permalink
upgrade django to 3.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
usmannasir committed Dec 21, 2019
1 parent e723442 commit d31ddad
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CLManager/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions IncBackups/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='')
Expand All @@ -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)


2 changes: 1 addition & 1 deletion cyberpanel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion databases/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion dockerManager/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion loginSystem/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)



Expand Down
4 changes: 3 additions & 1 deletion requirments.txt
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion websiteFunctions/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down

0 comments on commit d31ddad

Please sign in to comment.