Update for django 2.2

diff --git a/pgmailmgr/auth.py b/pgmailmgr/auth.py
index 4ae553b2f78f5080e6ca577c57fb9e95f87f8fbf..87ffb0b2adbcd45d956b7f625dc9ae29c7807bfa 100644 (file)
--- a/pgmailmgr/auth.py
+++ b/pgmailmgr/auth.py
@@ -72,7 +72,7 @@ def login(request):
 # Handle logout requests by logging out of this site and then
 # redirecting to log out from the main site as well.
 def logout(request):
-    if request.user.is_authenticated():
+    if request.user.is_authenticated:
         django_logout(request)
     return HttpResponseRedirect("%slogout/" % settings.PGAUTH_REDIRECT)
 

diff --git a/pgmailmgr/mailmgr/models.py b/pgmailmgr/mailmgr/models.py
index df907064a88257cae0ad5747580fd059f44f4368..9de90386efe5d20b513ffa590ce3a541af0ecc12 100644 (file)
--- a/pgmailmgr/mailmgr/models.py
+++ b/pgmailmgr/mailmgr/models.py
@@ -24,7 +24,7 @@ class LocalDomain(models.Model):
 class Forwarder(models.Model):
     forwarder_id = models.AutoField(null=False, primary_key=True)
     local_part = models.CharField(max_length=100, null=False, blank=False)
-    local_domain = models.ForeignKey(LocalDomain, null=False, blank=False, db_column='local_domain_id')
+    local_domain = models.ForeignKey(LocalDomain, null=False, blank=False, db_column='local_domain_id', on_delete=models.CASCADE)
     remote_name = models.CharField(max_length=200, null=False, blank=False)
 
     def __str__(self):
@@ -40,7 +40,7 @@ class Forwarder(models.Model):
 
 class VirtualUser(models.Model):
     virtual_user_id = models.AutoField(null=False, primary_key=True)
-    local_domain = models.ForeignKey(LocalDomain, null=False, blank=False, db_column='local_domain_id')
+    local_domain = models.ForeignKey(LocalDomain, null=False, blank=False, db_column='local_domain_id', on_delete=models.CASCADE)
     local_part = models.CharField(max_length=100, null=False, blank=False)
     mail_quota = models.IntegerField(null=False)
     passwd = models.CharField(max_length=100, null=False, blank=False, verbose_name="Password")
@@ -59,8 +59,8 @@ class VirtualUser(models.Model):
 
 
 class UserPermissions(models.Model):
-    user = models.ForeignKey(User, null=False)
-    domain = models.ForeignKey(LocalDomain, null=False)
+    user = models.ForeignKey(User, null=False, on_delete=models.CASCADE)
+    domain = models.ForeignKey(LocalDomain, null=False, on_delete=models.CASCADE)
     pattern = models.CharField(max_length=100, null=False, blank=False)
 
     def __str__(self):
@@ -68,7 +68,7 @@ class UserPermissions(models.Model):
 
 
 class Log(models.Model):
-    user = models.ForeignKey(User, null=False)
+    user = models.ForeignKey(User, null=False, on_delete=models.CASCADE)
     when = models.DateTimeField(null=False, auto_now=True)
     what = models.CharField(max_length=2048, null=False, blank=False)
 

diff --git a/pgmailmgr/settings.py b/pgmailmgr/settings.py
index 381729e56593145969040101d9d776a6a18213e7..90d34d0ad3fc702879b99c7af171b7ab16b7278d 100644 (file)
--- a/pgmailmgr/settings.py
+++ b/pgmailmgr/settings.py
@@ -87,7 +87,7 @@ STATICFILES_FINDERS = (
 # Make this unique, and don't share it with anybody.
 # SECRET_KEY lives in settings_local.py
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',

diff --git a/pgmailmgr/urls.py b/pgmailmgr/urls.py
index 9e18e02fc74c39ebcfdd20087c20e26f2ace9814..1daa507c2df40cd70061519fedd97096d18f859b 100644 (file)
--- a/pgmailmgr/urls.py
+++ b/pgmailmgr/urls.py
@@ -18,5 +18,5 @@ urlpatterns = [
     url('^accounts/login/$', pgmailmgr.auth.login),
 
     # Uncomment the next line to enable the admin:
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]