Add required on_delete parameters for Dj2.0 compatibility

allianceauth/corputils/models.py

@@ -18,7 +18,7 @@ logger = logging.getLogger(__name__)
 
 class CorpStats(models.Model):
     token = models.ForeignKey(Token, on_delete=models.CASCADE)
-    corp = models.OneToOneField(EveCorporationInfo)
+    corp = models.OneToOneField(EveCorporationInfo, on_delete=models.CASCADE)
     last_update = models.DateTimeField(auto_now=True)
 
     class Meta:

allianceauth/eveonline/migrations/0009_on_delete.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-28 02:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('eveonline', '0008_remove_apikeys'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='evecorporationinfo',
+            name='alliance',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.EveAllianceInfo'),
+        ),
+    ]

allianceauth/eveonline/models.py

@@ -41,7 +41,7 @@ class EveCorporationInfo(models.Model):
     corporation_name = models.CharField(max_length=254, unique=True)
     corporation_ticker = models.CharField(max_length=254)
     member_count = models.IntegerField()
-    alliance = models.ForeignKey(EveAllianceInfo, blank=True, null=True)
+    alliance = models.ForeignKey(EveAllianceInfo, blank=True, null=True, on_delete=models.SET_NULL)
 
     objects = EveCorporationManager()
     provider = EveCorporationProviderManager()

allianceauth/fleetactivitytracking/models.py

@@ -23,11 +23,11 @@ class Fatlink(models.Model):
 
 class Fat(models.Model):
     character = models.ForeignKey(EveCharacter, on_delete=models.CASCADE)
-    fatlink = models.ForeignKey(Fatlink)
+    fatlink = models.ForeignKey(Fatlink, on_delete=models.CASCADE)
     system = models.CharField(max_length=30)
     shiptype = models.CharField(max_length=30)
     station = models.CharField(max_length=125)
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
 
     class Meta:
         unique_together = (('character', 'fatlink'),)

allianceauth/groupmanagement/migrations/0007_on_delete.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-28 02:16
+from __future__ import unicode_literals
+
+import django.contrib.auth.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auth', '0008_alter_user_username_max_length'),
+        ('groupmanagement', '0006_request_groups_perm'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ProxyGroup',
+            fields=[
+            ],
+            options={
+                'verbose_name': 'group',
+                'indexes': [],
+                'proxy': True,
+                'verbose_name_plural': 'groups',
+            },
+            bases=('auth.group',),
+            managers=[
+                ('objects', django.contrib.auth.models.GroupManager()),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='grouprequest',
+            name='main_char',
+        ),
+    ]

allianceauth/groupmanagement/models.py

@@ -10,9 +10,16 @@ from allianceauth.eveonline.models import EveCharacter
 class GroupRequest(models.Model):
     status = models.CharField(max_length=254)
     leave_request = models.BooleanField(default=0)
-    user = models.ForeignKey(User)
-    group = models.ForeignKey(Group)
-    main_char = models.ForeignKey(EveCharacter)
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    group = models.ForeignKey(Group, on_delete=models.CASCADE)
+
+    @property
+    def main_char(self):
+        """
+        Legacy property for main character
+        :return: self.users main character
+        """
+        return self.user.profile.main_character
 
     def __str__(self):
         return self.user.username + ":" + self.group.name

allianceauth/hrapplications/models.py

@@ -23,7 +23,7 @@ class ApplicationChoice(models.Model):
 
 class ApplicationForm(models.Model):
     questions = SortedManyToManyField(ApplicationQuestion)
-    corp = models.OneToOneField(EveCorporationInfo)
+    corp = models.OneToOneField(EveCorporationInfo, on_delete=models.CASCADE)
 
     def __str__(self):
         return str(self.corp)

allianceauth/optimer/migrations/0004_on_delete.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-28 02:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('optimer', '0003_make_strings_more_stringy'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='optimer',
+            name='eve_character',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.EveCharacter'),
+        ),
+    ]

allianceauth/optimer/models.py

@@ -17,7 +17,7 @@ class OpTimer(models.Model):
     operation_name = models.CharField(max_length=254, default="")
     fc = models.CharField(max_length=254, default="")
     post_time = models.DateTimeField(default=timezone.now)
-    eve_character = models.ForeignKey(EveCharacter)
+    eve_character = models.ForeignKey(EveCharacter, null=True, on_delete=models.SET_NULL)
 
     def __str__(self):
         return self.operation_name

allianceauth/services/modules/mumble/models.py

@@ -2,7 +2,7 @@ from django.db import models
 
 
 class MumbleUser(models.Model):
-    user = models.OneToOneField('auth.User', related_name='mumble', null=True)
+    user = models.OneToOneField('auth.User', related_name='mumble', null=True, on_delete=models.CASCADE)
     username = models.CharField(max_length=254, unique=True)
     pwhash = models.CharField(max_length=80)
     hashfn = models.CharField(max_length=20, default='sha1')

allianceauth/services/modules/teamspeak3/models.py

@@ -30,7 +30,7 @@ class TSgroup(models.Model):
 
 
 class AuthTS(models.Model):
-    auth_group = models.ForeignKey('auth.Group')
+    auth_group = models.ForeignKey('auth.Group', on_delete=models.CASCADE)
     ts_group = models.ManyToManyField(TSgroup)
 
     class Meta:
@@ -41,7 +41,7 @@ class AuthTS(models.Model):
 
 
 class UserTSgroup(models.Model):
-    user = models.ForeignKey('auth.User')
+    user = models.ForeignKey('auth.User', on_delete=models.CASCADE)
     ts_group = models.ManyToManyField(TSgroup)
 
     class Meta:

allianceauth/srp/migrations/0004_on_delete.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-28 02:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('srp', '0003_make_strings_more_stringy'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='srpfleetmain',
+            name='fleet_commander',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.EveCharacter'),
+        ),
+        migrations.AlterField(
+            model_name='srpuserrequest',
+            name='character',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.EveCharacter'),
+        ),
+    ]

allianceauth/srp/models.py

@@ -10,7 +10,7 @@ class SrpFleetMain(models.Model):
     fleet_time = models.DateTimeField()
     fleet_srp_code = models.CharField(max_length=254, default="")
     fleet_srp_status = models.CharField(max_length=254, default="")
-    fleet_commander = models.ForeignKey(EveCharacter)
+    fleet_commander = models.ForeignKey(EveCharacter, null=True, on_delete=models.SET_NULL)
     fleet_srp_aar_link = models.CharField(max_length=254, default="")
 
     def __str__(self):
@@ -40,8 +40,8 @@ class SrpUserRequest(models.Model):
     additional_info = models.CharField(max_length=254, default="")
     srp_status = models.CharField(max_length=8, default="Pending", choices=SRP_STATUS_CHOICES)
     srp_total_amount = models.BigIntegerField(default=0)
-    character = models.ForeignKey(EveCharacter)
-    srp_fleet_main = models.ForeignKey(SrpFleetMain)
+    character = models.ForeignKey(EveCharacter, null=True, on_delete=models.SET_NULL)
+    srp_fleet_main = models.ForeignKey(SrpFleetMain, on_delete=models.CASCADE)
     kb_total_loss = models.BigIntegerField(default=0)
     srp_ship_name = models.CharField(max_length=254, default="")
     post_time = models.DateTimeField(default=timezone.now)

allianceauth/timerboard/migrations/0003_on_delete.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2017-09-28 02:16
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('timerboard', '0002_make_strings_more_stringy'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='timer',
+            name='eve_character',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='eveonline.EveCharacter'),
+        ),
+        migrations.AlterField(
+            model_name='timer',
+            name='user',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

allianceauth/timerboard/models.py

@@ -16,10 +16,10 @@ class Timer(models.Model):
     objective = models.CharField(max_length=254, default="")
     eve_time = models.DateTimeField()
     important = models.BooleanField(default=False)
-    eve_character = models.ForeignKey(EveCharacter)
-    eve_corp = models.ForeignKey(EveCorporationInfo)
+    eve_character = models.ForeignKey(EveCharacter, null=True, on_delete=models.SET_NULL)
+    eve_corp = models.ForeignKey(EveCorporationInfo, on_delete=models.CASCADE)
     corp_timer = models.BooleanField(default=False)
-    user = models.ForeignKey(User)
+    user = models.ForeignKey(User, null=True, on_delete=models.SET_NULL)
 
     def __str__(self):
         return str(self.system) + ' ' + str(self.details)