fixed all the RemovedInDjango20 warnings

exploide · exploide · commit 6c794c5828ce · 2016-07-12T10:03:42.000+02:00
diff --git a/dashboard/urls.py b/dashboard/urls.py
@@ -2,6 +2,7 @@
 
 from . import views
 
+app_name = 'dashboard'
 urlpatterns = [
     #url(r'^$', views.index, name='index'),
     url(r'^$', views.IndexView.as_view(), name='index'),
diff --git a/exam/dashboard_urls.py b/exam/dashboard_urls.py
@@ -2,6 +2,7 @@
 
 from . import dashboard_views
 
+app_name = 'exam'
 urlpatterns = [
     url(r'^assignment/$', dashboard_views.AssignmentIndexView.as_view(), name='assignment'),
     url(r'^assignment/new$', dashboard_views.MakeAssignmentView.as_view(), name='assignment_new'),
diff --git a/exam/migrations/0001_initial.py b/exam/migrations/0001_initial.py
@@ -21,8 +21,8 @@ class Migration(migrations.Migration):
                 ('spacing', models.PositiveSmallIntegerField(verbose_name='Sitzplatzabstand', choices=[(1, 'Ein Platz Abstand'), (2, 'Zwei Plätze Abstand')], default=2)),
                 ('mode', models.PositiveSmallIntegerField(verbose_name='Verteilmodus', choices=[(0, 'Gleichmäßig auf alle Räume verteilen'), (1, 'Möglichst wenig Räume')], default=0)),
                 ('count', models.PositiveIntegerField(verbose_name='# Zuteilungen')),
-                ('group_category', models.ForeignKey(verbose_name='Gruppenkategorie', to='staff.GroupCategory')),
-                ('ophase', models.ForeignKey(to='ophasebase.Ophase')),
+                ('group_category', models.ForeignKey(verbose_name='Gruppenkategorie', to='staff.GroupCategory', on_delete=models.CASCADE)),
+                ('ophase', models.ForeignKey(to='ophasebase.Ophase', on_delete=models.CASCADE)),
             ],
             options={
                 'verbose_name': 'Klausurzuteilung',
@@ -37,7 +37,7 @@ class Migration(migrations.Migration):
                 ('available', models.BooleanField(verbose_name='Verfügbar', default=True)),
                 ('capacity_1_free', models.IntegerField(verbose_name='Plätze (1 Platz Abstand)')),
                 ('capacity_2_free', models.IntegerField(verbose_name='Plätze (2 Plätze Abstand)')),
-                ('room', models.OneToOneField(to='ophasebase.Room', verbose_name='Raum')),
+                ('room', models.OneToOneField(to='ophasebase.Room', verbose_name='Raum', on_delete=models.CASCADE)),
             ],
             options={
                 'verbose_name': 'Klausurraum',
@@ -49,9 +49,9 @@ class Migration(migrations.Migration):
             name='PersonToExamRoomAssignment',
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('assignment', models.ForeignKey(to='exam.Assignment')),
-                ('person', models.ForeignKey(to='students.Student')),
-                ('room', models.ForeignKey(to='exam.ExamRoom')),
+                ('assignment', models.ForeignKey(to='exam.Assignment', on_delete=models.CASCADE)),
+                ('person', models.ForeignKey(to='students.Student', on_delete=models.CASCADE)),
+                ('room', models.ForeignKey(to='exam.ExamRoom', on_delete=models.CASCADE)),
             ],
             options={
                 'verbose_name': 'Individuelle Klausurzuteilung',
diff --git a/exam/models.py b/exam/models.py
@@ -15,7 +15,7 @@ class Meta:
         verbose_name_plural = _('Klausurräume')
         ordering = ['available', '-capacity_1_free', '-capacity_2_free', 'room']
 
-    room = models.OneToOneField('ophasebase.Room', verbose_name=_('Raum'), limit_choices_to={"type": "HS"})
+    room = models.OneToOneField('ophasebase.Room', models.CASCADE, verbose_name=_('Raum'), limit_choices_to={"type": "HS"})
     available = models.BooleanField(verbose_name=_('Verfügbar'), default=True)
     capacity_1_free = models.IntegerField(verbose_name=_('Plätze (1 Platz Abstand)'))
     capacity_2_free = models.IntegerField(verbose_name=_('Plätze (2 Plätze Abstand)'))
@@ -51,9 +51,9 @@ class Meta:
         (1, _('Möglichst wenig Räume'))
     )
 
-    ophase = models.ForeignKey(Ophase)
+    ophase = models.ForeignKey(Ophase, models.CASCADE)
     created_at = models.DateTimeField(auto_now_add=True)
-    group_category = models.ForeignKey(GroupCategory, verbose_name=_('Gruppenkategorie'))
+    group_category = models.ForeignKey(GroupCategory, models.CASCADE, verbose_name=_('Gruppenkategorie'))
     spacing = models.PositiveSmallIntegerField(choices=SPACING_CHOICES, default=2, verbose_name=_('Sitzplatzabstand'))
     mode = models.PositiveSmallIntegerField(choices=MODE_CHOICES, default=0, verbose_name=_('Verteilmodus'))
     count = models.PositiveIntegerField(verbose_name=_('# Zuteilungen'))
@@ -135,6 +135,6 @@ class Meta:
         verbose_name_plural = _('Individuelle Klausurzuteilungen')
         ordering = ['assignment', 'room', 'person__name', 'person__prename']
 
-    assignment = models.ForeignKey(Assignment)
-    room = models.ForeignKey(ExamRoom)
-    person = models.ForeignKey(Student)
+    assignment = models.ForeignKey(Assignment, models.CASCADE)
+    room = models.ForeignKey(ExamRoom, models.CASCADE)
+    person = models.ForeignKey(Student, models.CASCADE)
diff --git a/exam/urls.py b/exam/urls.py
@@ -2,4 +2,5 @@
 
 from exam import views
 
+app_name = 'exam'
 urlpatterns = []
diff --git a/ophasebase/migrations/0001_initial.py b/ophasebase/migrations/0001_initial.py
@@ -49,7 +49,7 @@ class Migration(migrations.Migration):
                 ('capacity', models.IntegerField(verbose_name='Anzahl Plätze')),
                 ('lat', models.FloatField(verbose_name='Latitude', blank=True, default=0)),
                 ('lng', models.FloatField(verbose_name='Longitude', blank=True, default=0)),
-                ('building', models.ForeignKey(verbose_name='Gebäude', to='ophasebase.Building')),
+                ('building', models.ForeignKey(verbose_name='Gebäude', to='ophasebase.Building', on_delete=models.CASCADE)),
             ],
             options={
                 'verbose_name': 'Raum',
diff --git a/ophasebase/models.py b/ophasebase/models.py
@@ -50,7 +50,7 @@ class Meta:
         ("SO", _('Sonstiges'))
     )
 
-    building = models.ForeignKey(Building, verbose_name=_('Gebäude'))
+    building = models.ForeignKey(Building, models.CASCADE, verbose_name=_('Gebäude'))
     number = models.CharField(max_length=50, verbose_name=_('Nummer'))
     type = models.CharField(max_length=2, choices=ROOM_TYPE_CHOICES, verbose_name=_('Typ'))
     has_beamer = models.BooleanField(default=False, verbose_name=_('Beamer vorhanden?'))
diff --git a/ophasebase/urls.py b/ophasebase/urls.py
@@ -2,6 +2,7 @@
 
 from ophasebase import views
 
+app_name = 'ophasebase'
 urlpatterns = [
     url(r'^$', views.WelcomeView.as_view(), name='welcome'),
 ]
diff --git a/pyophase/urls.py b/pyophase/urls.py
@@ -12,7 +12,7 @@
     url(r'^klausur/', include('exam.urls', namespace='exam')),
     url(r'^workshops/', include('workshops.urls', namespace='workshops')),
     url(r'^dashboard/', include('dashboard.urls', namespace='dashboard')),
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
     url(r'^accounts/login/$', django.contrib.auth.views.login, {'template_name': 'admin/login.html'}, name='login'),
     url(r'^accounts/logout/$', django.contrib.auth.views.logout, {'next_page': reverse_lazy('ophasebase:welcome')}, name='logout'),
     url(r'^i18n/', include('django.conf.urls.i18n')),
diff --git a/staff/dashboard_urls.py b/staff/dashboard_urls.py
@@ -1,7 +1,8 @@
 from django.conf.urls import url
 
-from .dashboard_views import GroupMassCreateView, TutorPairingView, TutorPairingSuccess
+from staff.dashboard_views import GroupMassCreateView, TutorPairingView, TutorPairingSuccess
 
+app_name = 'staff'
 urlpatterns = [
     url(r'^group_mass_create$', GroupMassCreateView.as_view(), name='group_mass_create'),
     url(r'^tutor_pairing$', TutorPairingView.as_view(), name='tutor_pairing'),
diff --git a/staff/migrations/0001_initial.py b/staff/migrations/0001_initial.py
@@ -77,11 +77,11 @@ class Migration(migrations.Migration):
                 ('remarks', models.TextField(verbose_name='Anmerkungen', blank=True, help_text='Was sollten wir noch wissen?')),
                 ('created_at', models.DateTimeField(verbose_name='Eingetragen am', auto_now_add=True)),
                 ('updated_at', models.DateTimeField(verbose_name='Verändert am', auto_now=True)),
-                ('dress_size', models.ForeignKey(to='staff.DressSize', null=True, help_text='Mitwirkende bekommen T-Shirts um sie besser zu erkennen. Damit dein T-Shirt passt brauchen wir deine Größe.', verbose_name='Kleidergröße', blank=True)),
+                ('dress_size', models.ForeignKey(to='staff.DressSize', null=True, help_text='Mitwirkende bekommen T-Shirts um sie besser zu erkennen. Damit dein T-Shirt passt brauchen wir deine Größe.', verbose_name='Kleidergröße', blank=True, on_delete=models.SET_NULL)),
                 ('helper_jobs', models.ManyToManyField(verbose_name='Helferaufgaben', to='staff.HelperJob', blank=True, help_text='Bei welchen Aufgaben kannst du dir vorstellen zu helfen?')),
-                ('ophase', models.ForeignKey(to='ophasebase.Ophase')),
+                ('ophase', models.ForeignKey(to='ophasebase.Ophase', on_delete=models.CASCADE)),
                 ('orga_jobs', models.ManyToManyField(verbose_name='Orgaaufgaben', to='staff.OrgaJob', blank=True, help_text='Welche Orgaaufgaben kannst du dir vorstellen zu übernehmen?')),
-                ('tutor_for', models.ForeignKey(to='staff.GroupCategory', null=True, help_text='Erstsemester welches Studiengangs möchtest du als Tutor betreuen?', verbose_name='Tutor für', blank=True)),
+                ('tutor_for', models.ForeignKey(to='staff.GroupCategory', null=True, help_text='Erstsemester welches Studiengangs möchtest du als Tutor betreuen?', verbose_name='Tutor für', blank=True, on_delete=models.SET_NULL)),
             ],
             options={
                 'verbose_name': 'Person',
diff --git a/staff/migrations/0002_tutorgroup.py b/staff/migrations/0002_tutorgroup.py
@@ -17,8 +17,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(primary_key=True, serialize=False, verbose_name='ID', auto_created=True)),
                 ('name', models.CharField(verbose_name='Gruppenname', max_length=50)),
-                ('group_category', models.ForeignKey(verbose_name='Gruppenkategorie', to='staff.GroupCategory')),
-                ('ophase', models.ForeignKey(to='ophasebase.Ophase')),
+                ('group_category', models.ForeignKey(verbose_name='Gruppenkategorie', to='staff.GroupCategory', on_delete=models.CASCADE)),
+                ('ophase', models.ForeignKey(to='ophasebase.Ophase', on_delete=models.CASCADE)),
                 ('tutors', models.ManyToManyField(verbose_name='Tutoren', blank=True, to='staff.Person')),
             ],
             options={
diff --git a/staff/migrations/0007_auto_20160711_2000.py b/staff/migrations/0007_auto_20160711_2000.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-11 18:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('staff', '0006_auto_20160530_0117'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='person',
+            name='dress_size',
+            field=models.ForeignKey(blank=True, help_text='Mitwirkende bekommen T-Shirts um sie besser zu erkennen. Damit dein T-Shirt passt brauchen wir deine Größe.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='staff.DressSize', verbose_name='Kleidergröße'),
+        ),
+        migrations.AlterField(
+            model_name='person',
+            name='tutor_for',
+            field=models.ForeignKey(blank=True, help_text='Erstsemester welches Studiengangs möchtest du als Tutor betreuen?', null=True, on_delete=django.db.models.deletion.SET_NULL, to='staff.GroupCategory', verbose_name='Tutor für'),
+        ),
+    ]
diff --git a/staff/models.py b/staff/models.py
@@ -69,7 +69,7 @@ class Meta:
         ordering = ['prename', 'name']
         unique_together = ('ophase', 'email')
 
-    ophase = models.ForeignKey(Ophase)
+    ophase = models.ForeignKey(Ophase, models.CASCADE)
     prename = models.CharField(max_length=60, verbose_name=_('first name'))
     name = models.CharField(max_length=75, verbose_name=_('last name'))
     email = models.EmailField(verbose_name=_("E-Mail-Adresse"))
@@ -81,10 +81,10 @@ class Meta:
     is_tutor = models.BooleanField(default=False, verbose_name=_("Tutor"), help_text=_("Möchtest du als Tutor bei der Ophase mitmachen?"))
     is_orga = models.BooleanField(default=False, verbose_name=_("Orga"), help_text=_("Möchtest du als Orga bei der Ophase mitmachen?"))
     is_helper = models.BooleanField(default=False, verbose_name=_("Helfer"), help_text=_("Möchtest du als Helfer bei der Ophase mitmachen?"))
-    tutor_for = models.ForeignKey(GroupCategory, blank=True, null=True, verbose_name=_("Tutor für"), help_text=_("Erstsemester welches Studiengangs möchtest du als Tutor betreuen?"))
+    tutor_for = models.ForeignKey(GroupCategory, models.SET_NULL, blank=True, null=True, verbose_name=_("Tutor für"), help_text=_("Erstsemester welches Studiengangs möchtest du als Tutor betreuen?"))
     orga_jobs = models.ManyToManyField(OrgaJob, blank=True, verbose_name=_("Orgaaufgaben"), help_text=_("Welche Orgaaufgaben kannst du dir vorstellen zu übernehmen?"))
     helper_jobs = models.ManyToManyField(HelperJob, blank=True, verbose_name=_("Helferaufgaben"), help_text=_("Bei welchen Aufgaben kannst du dir vorstellen zu helfen?"))
-    dress_size = models.ForeignKey(DressSize, null=True, blank=True, verbose_name=_("Kleidergröße"), help_text=_("Mitwirkende bekommen T-Shirts um sie besser zu erkennen. Damit dein T-Shirt passt brauchen wir deine Größe."))
+    dress_size = models.ForeignKey(DressSize, models.SET_NULL, null=True, blank=True, verbose_name=_("Kleidergröße"), help_text=_("Mitwirkende bekommen T-Shirts um sie besser zu erkennen. Damit dein T-Shirt passt brauchen wir deine Größe."))
     remarks = models.TextField(blank=True, verbose_name=_("Anmerkungen"), help_text=_("Was sollten wir noch wissen?"))
     orga_annotation = models.TextField(blank=True, verbose_name=_("Orga-Anmerkungen"), help_text=_("Notizen von Leitung und Orgas."))
     created_at = models.DateTimeField(auto_now_add=True, verbose_name=_("Eingetragen am"))
@@ -133,10 +133,10 @@ class Meta:
         ordering = ['group_category', 'name']
         unique_together = ('ophase', 'name')
 
-    ophase = models.ForeignKey(Ophase)
+    ophase = models.ForeignKey(Ophase, models.CASCADE)
     name = models.CharField(max_length=50, verbose_name=_("Gruppenname"))
     tutors = models.ManyToManyField(Person, blank=True, verbose_name=_("Tutoren"))
-    group_category = models.ForeignKey(GroupCategory, verbose_name=_("Gruppenkategorie"))
+    group_category = models.ForeignKey(GroupCategory, models.CASCADE, verbose_name=_("Gruppenkategorie"))
 
     def __str__(self):
         return self.name
diff --git a/staff/urls.py b/staff/urls.py
@@ -2,6 +2,7 @@
 
 from staff import views
 
+app_name = 'staff'
 urlpatterns = [
     url(r'^$', views.StaffAdd.as_view(), name='registration'),
     url(r'success/$', views.StaffAddSuccess.as_view(), name='registration_success'),
diff --git a/students/dashboard_urls.py b/students/dashboard_urls.py
@@ -1,12 +1,12 @@
 from django.conf.urls import url
 
-from .dashboard_views import StudentStatsView, ExportCertificateView, ExportNewsletterSubscriptionView, \
+from students.dashboard_views import StudentStatsView, ExportCertificateView, ExportNewsletterSubscriptionView, \
     NewsletterOverviewView
 
+app_name = 'students'
 urlpatterns = [
     url(r'^$', StudentStatsView.as_view(), name='index'),
     url(r'^certificate$', ExportCertificateView.as_view(), name='certificate'),
     url(r'^newsletter/$', NewsletterOverviewView.as_view(), name='newsletter'),
     url(r'^newsletter/(?P<newsletter_id>[0-9]+)/export/$', ExportNewsletterSubscriptionView.as_view(), name='newsletter_export'),
 ]
-
diff --git a/students/migrations/0001_initial.py b/students/migrations/0001_initial.py
@@ -34,7 +34,7 @@ class Migration(migrations.Migration):
                 ('want_newsletter', models.BooleanField(verbose_name='Newsletter abonnieren?', default=False)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('ophase', models.ForeignKey(to='ophasebase.Ophase')),
+                ('ophase', models.ForeignKey(to='ophasebase.Ophase', on_delete=models.CASCADE)),
             ],
             options={
                 'verbose_name': 'Erstie',
@@ -47,8 +47,8 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
                 ('name', models.CharField(verbose_name='Gruppenname', max_length=50)),
-                ('group_category', models.ForeignKey(verbose_name='Gruppenkategorie', to='staff.GroupCategory')),
-                ('ophase', models.ForeignKey(to='ophasebase.Ophase')),
+                ('group_category', models.ForeignKey(verbose_name='Gruppenkategorie', to='staff.GroupCategory', on_delete=models.CASCADE)),
+                ('ophase', models.ForeignKey(to='ophasebase.Ophase', on_delete=models.CASCADE)),
                 ('tutors', models.ManyToManyField(verbose_name='Tutoren', to='staff.Person')),
             ],
             options={
@@ -60,6 +60,6 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='student',
             name='tutor_group',
-            field=models.ForeignKey(verbose_name='Kleingruppe', to='students.TutorGroup'),
+            field=models.ForeignKey(verbose_name='Kleingruppe', to='students.TutorGroup', on_delete=models.CASCADE),
         ),
     ]
diff --git a/students/migrations/0003_auto_20150913_1509.py b/students/migrations/0003_auto_20150913_1509.py
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='student',
             name='tutor_group',
-            field=models.ForeignKey(verbose_name='Kleingruppe', to='staff.TutorGroup'),
+            field=models.ForeignKey(verbose_name='Kleingruppe', to='staff.TutorGroup', on_delete=models.CASCADE),
         ),
         migrations.DeleteModel(
             name='TutorGroup',
diff --git a/students/models.py b/students/models.py
@@ -32,10 +32,10 @@ class Meta:
     prename = models.CharField(max_length=50, verbose_name=_('first name'))
     name = models.CharField(max_length=50, verbose_name=_('last name'))
     email = models.EmailField(verbose_name=_("E-Mail-Adresse"), blank=True)
-    tutor_group = models.ForeignKey(TutorGroup, verbose_name=_("Kleingruppe"))
+    tutor_group = models.ForeignKey(TutorGroup, models.CASCADE, verbose_name=_("Kleingruppe"))
     want_exam = models.BooleanField(default=False, blank=True, verbose_name=_("Klausur mitschreiben?"))
     newsletters = models.ManyToManyField(Newsletter, blank=True, verbose_name=_("Newsletter"), help_text=_("Welche Newsletter willst du abonieren (optional)?"), limit_choices_to={'active': True})
-    ophase = models.ForeignKey(Ophase)
+    ophase = models.ForeignKey(Ophase, models.CASCADE)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
diff --git a/students/tests/tests_models.py b/students/tests/tests_models.py
diff --git a/students/tests/tests_views.py b/students/tests/tests_views.py
diff --git a/students/urls.py b/students/urls.py
diff --git a/workshops/models.py b/workshops/models.py
diff --git a/workshops/urls.py b/workshops/urls.py

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,5 @@`
`2`	`2`
`3`	`3`	`from exam import views`
`4`	`4`
	`5`	`+app_name = 'exam'`
`5`	`6`	`urlpatterns = []`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class Meta:`
`50`	`50`	`("SO", _('Sonstiges'))`
`51`	`51`	`)`
`52`	`52`
`53`		`- building = models.ForeignKey(Building, verbose_name=_('Gebäude'))`
	`53`	`+ building = models.ForeignKey(Building, models.CASCADE, verbose_name=_('Gebäude'))`
`54`	`54`	`number = models.CharField(max_length=50, verbose_name=_('Nummer'))`
`55`	`55`	`type = models.CharField(max_length=2, choices=ROOM_TYPE_CHOICES, verbose_name=_('Typ'))`
`56`	`56`	`has_beamer = models.BooleanField(default=False, verbose_name=_('Beamer vorhanden?'))`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`from ophasebase import views`
`4`	`4`
	`5`	`+app_name = 'ophasebase'`
`5`	`6`	`urlpatterns = [`
`6`	`7`	`url(r'^$', views.WelcomeView.as_view(), name='welcome'),`
`7`	`8`	`]`