Update to be compatible with django 2.2

diff --git a/hamnadmin/hamnadmin/register/migrations/0001_initial.py b/hamnadmin/hamnadmin/register/migrations/0001_initial.py
index 2778bd13769981c1ef350e578d8145a033654258..f98e47b17da2510853c3fa845df781f7dd0a449a 100644 (file)
--- a/hamnadmin/hamnadmin/register/migrations/0001_initial.py
+++ b/hamnadmin/hamnadmin/register/migrations/0001_initial.py
@@ -69,7 +69,7 @@ class Migration(migrations.Migration):
                 ('hidden', models.BooleanField()),
                 ('twittered', models.BooleanField()),
                 ('shortlink', models.CharField(max_length=255)),
-                ('feed', models.ForeignKey(related_name='posts', db_column='feed', to='register.Blog')),
+                ('feed', models.ForeignKey(related_name='posts', db_column='feed', to='register.Blog', on_delete=models.CASCADE)),
             ],
             options={
                 'ordering': ['-dat'],
@@ -91,11 +91,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='blog',
             name='team',
-            field=models.ForeignKey(db_column='team', blank=True, to='register.Team', null=True),
+            field=models.ForeignKey(db_column='team', blank=True, to='register.Team', null=True, on_delete=models.CASCADE),
         ),
         migrations.AddField(
             model_name='aggregatorlog',
             name='feed',
-            field=models.ForeignKey(to='register.Blog', db_column='feed'),
+            field=models.ForeignKey(to='register.Blog', db_column='feed', on_delete=models.CASCADE),
         ),
     ]

diff --git a/hamnadmin/hamnadmin/register/migrations/0003_user_foreign_key.py b/hamnadmin/hamnadmin/register/migrations/0003_user_foreign_key.py
index c7a04356959d851c239173b58385c429f6cd9767..0c4a2a3f0a9786fe77a5ca0036891f56607b3c0a 100644 (file)
--- a/hamnadmin/hamnadmin/register/migrations/0003_user_foreign_key.py
+++ b/hamnadmin/hamnadmin/register/migrations/0003_user_foreign_key.py
@@ -16,14 +16,14 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='blog',
             name='user',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True),
+            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE),
             preserve_default=False,
         ),
                migrations.RunSQL("UPDATE feeds SET user_id=(SELECT id FROM auth_user WHERE auth_user.username=userid)"),
                migrations.AlterField(
                        model_name='blog',
                        name='user',
-                       field=models.ForeignKey(to=settings.AUTH_USER_MODEL),
+                       field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
                ),
         migrations.RemoveField(
             model_name='blog',

diff --git a/hamnadmin/hamnadmin/register/migrations/0005_add_team_manager.py b/hamnadmin/hamnadmin/register/migrations/0005_add_team_manager.py
index ef57a125976d6018efda60b4c75d0130775a567e..b11aae3d8721389f4c2082a596959cdc09048822 100644 (file)
--- a/hamnadmin/hamnadmin/register/migrations/0005_add_team_manager.py
+++ b/hamnadmin/hamnadmin/register/migrations/0005_add_team_manager.py
@@ -16,6 +16,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='team',
             name='manager',
-            field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True),
+            field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE),
         ),
     ]

diff --git a/hamnadmin/hamnadmin/register/models.py b/hamnadmin/hamnadmin/register/models.py
index 2c2fffa7b4aa4c060bfa2af6b836e6c1dc01f2ce..d4e500e9a3aa40749c176ff611719bfb4fa55fa5 100644 (file)
--- a/hamnadmin/hamnadmin/register/models.py
+++ b/hamnadmin/hamnadmin/register/models.py
@@ -7,7 +7,7 @@ from hamnadmin.util.shortlink import urlvalmap
 class Team(models.Model):
        teamurl = models.CharField(max_length=255, blank=False)
        name = models.CharField(max_length=255, blank=False)
-       manager = models.ForeignKey(User, null=True, blank=True)
+       manager = models.ForeignKey(User, null=True, blank=True, on_delete=models.CASCADE)
 
        def __str__(self):
                return "%s (%s)" % (self.name, self.teamurl)
@@ -24,11 +24,11 @@ class Blog(models.Model):
        name = models.CharField(max_length=255, blank=False)
        blogurl = models.CharField(max_length=255, blank=False)
        lastget = models.DateTimeField(default=datetime(2000,1,1))
-       user = models.ForeignKey(User, null=False, blank=False)
+       user = models.ForeignKey(User, null=False, blank=False, on_delete=models.CASCADE)
        approved = models.BooleanField(default=False)
        archived = models.BooleanField(default=False)
        authorfilter = models.CharField(max_length=255,default='',blank=True)
-       team = models.ForeignKey(Team,db_column='team', blank=True, null=True)
+       team = models.ForeignKey(Team,db_column='team', blank=True, null=True, on_delete=models.CASCADE)
        twitteruser = models.CharField(max_length=255, default='', blank=True)
        excludestats = models.BooleanField(null=False, blank=False, default=False)
 
@@ -69,7 +69,7 @@ class Blog(models.Model):
                pass
 
 class Post(models.Model):
-       feed = models.ForeignKey(Blog,db_column='feed',related_name='posts')
+       feed = models.ForeignKey(Blog,db_column='feed',related_name='posts', on_delete=models.CASCADE)
        guid = models.CharField(max_length=255)
        link = models.CharField(max_length=255)
        txt = models.TextField()
@@ -124,7 +124,7 @@ class AuditEntry(models.Model):
                
 class AggregatorLog(models.Model):
        ts = models.DateTimeField(auto_now=True)
-       feed = models.ForeignKey(Blog, db_column='feed')
+       feed = models.ForeignKey(Blog, db_column='feed', on_delete=models.CASCADE)
        success = models.BooleanField()
        info = models.TextField()
        

diff --git a/hamnadmin/hamnadmin/register/urls.py b/hamnadmin/hamnadmin/register/urls.py
index a4a6968a87eb6772cb33b799f0031911ca4a809d..c2d4568e94574aee88fd2f893747c9ec6b030b4d 100644 (file)
--- a/hamnadmin/hamnadmin/register/urls.py
+++ b/hamnadmin/hamnadmin/register/urls.py
@@ -26,5 +26,5 @@ urlpatterns = [
     url(r'^auth_receive/$', hamnadmin.auth.auth_receive),
     url(r'^logout/$', hamnadmin.auth.logout),
 
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]

diff --git a/hamnadmin/hamnadmin/settings.py b/hamnadmin/hamnadmin/settings.py
index dff27266555161c65387b7c04ea708a49f6427de..151168225dd55d495c967b203215b340bc57cf87 100644 (file)
--- a/hamnadmin/hamnadmin/settings.py
+++ b/hamnadmin/hamnadmin/settings.py
@@ -30,7 +30,7 @@ STATIC_URL = '/media/'
 
 SECRET_KEY = '_q-piuw^kw^v1f%b6nrla+p%=&1bt#z%c$ujhioxe^!z%8q1l0'
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
        'django.middleware.csrf.CsrfViewMiddleware',
@@ -60,6 +60,7 @@ INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
+    'django.contrib.messages',
     'hamnadmin.register',
     'hamnadmin.mailqueue',
     'django.contrib.admin',