diff --git a/combo/apps/calendar/migrations/0001_initial.py b/combo/apps/calendar/migrations/0001_initial.py index fbb134ee..d2a604e6 100644 --- a/combo/apps/calendar/migrations/0001_initial.py +++ b/combo/apps/calendar/migrations/0001_initial.py @@ -30,7 +30,7 @@ class Migration(migrations.Migration): ('slot_duration', models.DurationField(default=datetime.timedelta(0, 1800), help_text='Format is hours:minutes:seconds', verbose_name='Slot duration')), ('minimal_booking_duration', models.DurationField(default=datetime.timedelta(0, 3600), help_text='Format is hours:minutes:seconds', verbose_name='Minimal booking duration')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Booking Calendar', diff --git a/combo/apps/dashboard/migrations/0001_initial.py b/combo/apps/dashboard/migrations/0001_initial.py index 357a7bbf..c308e533 100644 --- a/combo/apps/dashboard/migrations/0001_initial.py +++ b/combo/apps/dashboard/migrations/0001_initial.py @@ -27,7 +27,7 @@ class Migration(migrations.Migration): ('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')), ('last_update_timestamp', models.DateTimeField(auto_now=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Dashboard', @@ -39,9 +39,9 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('cell_pk', models.PositiveIntegerField()), ('order', models.PositiveIntegerField()), - ('cell_type', models.ForeignKey(to='contenttypes.ContentType')), - ('dashboard', models.ForeignKey(to='dashboard.DashboardCell')), - ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)), + ('cell_type', models.ForeignKey(to='contenttypes.ContentType', on_delete=models.CASCADE)), + ('dashboard', models.ForeignKey(to='dashboard.DashboardCell', on_delete=models.CASCADE)), + ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)), ], options={ 'ordering': ('order',), diff --git a/combo/apps/dashboard/models.py b/combo/apps/dashboard/models.py index 6e6072f0..4868be17 100644 --- a/combo/apps/dashboard/models.py +++ b/combo/apps/dashboard/models.py @@ -50,11 +50,11 @@ class DashboardCell(CellBase): class Tile(models.Model): - dashboard = models.ForeignKey(DashboardCell) - cell_type = models.ForeignKey(ContentType) + dashboard = models.ForeignKey(DashboardCell, on_delete=models.CASCADE) + cell_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) cell_pk = models.PositiveIntegerField() cell = fields.GenericForeignKey('cell_type', 'cell_pk') - user = models.ForeignKey(settings.AUTH_USER_MODEL) + user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) order = models.IntegerField() class Meta: diff --git a/combo/apps/dataviz/migrations/0001_initial.py b/combo/apps/dataviz/migrations/0001_initial.py index 51dff8ff..84ae4478 100644 --- a/combo/apps/dataviz/migrations/0001_initial.py +++ b/combo/apps/dataviz/migrations/0001_initial.py @@ -26,7 +26,7 @@ class Migration(migrations.Migration): ('data_source', models.CharField(max_length=150, null=True, verbose_name='Data Source', blank=True)), ('max_value', models.PositiveIntegerField(null=True, verbose_name='Max Value', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Gauge', diff --git a/combo/apps/dataviz/migrations/0003_cubesbarchart_cubestable.py b/combo/apps/dataviz/migrations/0003_cubesbarchart_cubestable.py index cd6ba1f9..537f36d7 100644 --- a/combo/apps/dataviz/migrations/0003_cubesbarchart_cubestable.py +++ b/combo/apps/dataviz/migrations/0003_cubesbarchart_cubestable.py @@ -30,7 +30,7 @@ class Migration(migrations.Migration): ('drilldown2', models.CharField(max_length=64, null=True, verbose_name='Drilldown 2', blank=True)), ('other_parameters', models.TextField(null=True, verbose_name='Other parameters', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Cubes Barchart', @@ -54,7 +54,7 @@ class Migration(migrations.Migration): ('drilldown2', models.CharField(max_length=64, null=True, verbose_name='Drilldown 2', blank=True)), ('other_parameters', models.TextField(null=True, verbose_name='Other parameters', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Cubes Table', diff --git a/combo/apps/dataviz/migrations/0006_chartcell.py b/combo/apps/dataviz/migrations/0006_chartcell.py index 7911966c..b83762a3 100644 --- a/combo/apps/dataviz/migrations/0006_chartcell.py +++ b/combo/apps/dataviz/migrations/0006_chartcell.py @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=150, null=True, verbose_name='Title', blank=True)), ('url', models.URLField(max_length=150, null=True, verbose_name='URL', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Chart', diff --git a/combo/apps/family/migrations/0001_initial.py b/combo/apps/family/migrations/0001_initial.py index c0d27efe..4732d0cd 100644 --- a/combo/apps/family/migrations/0001_initial.py +++ b/combo/apps/family/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Slug', blank=True)), ('public', models.BooleanField(default=True, verbose_name='Public')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Family Information Cell', diff --git a/combo/apps/fargo/migrations/0001_initial.py b/combo/apps/fargo/migrations/0001_initial.py index 65ebceb7..2de3d347 100644 --- a/combo/apps/fargo/migrations/0001_initial.py +++ b/combo/apps/fargo/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=True, verbose_name='Public')), ('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Recent Documents', diff --git a/combo/apps/gallery/migrations/0001_initial.py b/combo/apps/gallery/migrations/0001_initial.py index cd460bc2..0cc4dc1f 100644 --- a/combo/apps/gallery/migrations/0001_initial.py +++ b/combo/apps/gallery/migrations/0001_initial.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')), ('last_update_timestamp', models.DateTimeField(auto_now=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Gallery', @@ -37,7 +37,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('image', models.ImageField(upload_to=b'uploads/gallery/%Y/%m/', verbose_name='Image')), ('order', models.PositiveIntegerField()), - ('gallery', models.ForeignKey(verbose_name='Gallery', to='gallery.GalleryCell')), + ('gallery', models.ForeignKey(verbose_name='Gallery', to='gallery.GalleryCell', on_delete=models.CASCADE)), ], options={ 'ordering': ['order'], diff --git a/combo/apps/gallery/models.py b/combo/apps/gallery/models.py index c6b1a89d..cd1ee903 100644 --- a/combo/apps/gallery/models.py +++ b/combo/apps/gallery/models.py @@ -50,7 +50,7 @@ class GalleryCell(CellBase): class Image(models.Model): - gallery = models.ForeignKey(GalleryCell, verbose_name=_('Gallery')) + gallery = models.ForeignKey(GalleryCell, on_delete=models.CASCADE, verbose_name=_('Gallery')) image = models.ImageField(_('Image'), upload_to='uploads/gallery/%Y/%m/') order = models.PositiveIntegerField() diff --git a/combo/apps/lingo/migrations/0001_initial.py b/combo/apps/lingo/migrations/0001_initial.py index 984259d8..e2755be5 100644 --- a/combo/apps/lingo/migrations/0001_initial.py +++ b/combo/apps/lingo/migrations/0001_initial.py @@ -40,7 +40,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Slug', blank=True)), ('public', models.BooleanField(default=True, verbose_name='Public')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Basket', @@ -65,13 +65,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='basketitem', name='regie', - field=models.ForeignKey(to='lingo.Regie'), + field=models.ForeignKey(to='lingo.Regie', on_delete=models.CASCADE), preserve_default=True, ), migrations.AddField( model_name='basketitem', name='user', - field=models.ForeignKey(to=settings.AUTH_USER_MODEL), + field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE), preserve_default=True, ), ] diff --git a/combo/apps/lingo/migrations/0005_auto_20150307_1242.py b/combo/apps/lingo/migrations/0005_auto_20150307_1242.py index b5392e88..2898f3ae 100644 --- a/combo/apps/lingo/migrations/0005_auto_20150307_1242.py +++ b/combo/apps/lingo/migrations/0005_auto_20150307_1242.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Slug', blank=True)), ('public', models.BooleanField(default=True, verbose_name='Public')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Recent Transactions', @@ -34,7 +34,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='transaction', name='user', - field=models.ForeignKey(default=0, to=settings.AUTH_USER_MODEL), + field=models.ForeignKey(default=0, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE), preserve_default=False, ), ] diff --git a/combo/apps/lingo/migrations/0007_lingobasketlinkcell.py b/combo/apps/lingo/migrations/0007_lingobasketlinkcell.py index 4af84ddd..3a65307a 100644 --- a/combo/apps/lingo/migrations/0007_lingobasketlinkcell.py +++ b/combo/apps/lingo/migrations/0007_lingobasketlinkcell.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Slug', blank=True)), ('public', models.BooleanField(default=True, verbose_name='Public')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Basket Link', diff --git a/combo/apps/lingo/migrations/0008_auto_20150908_1538.py b/combo/apps/lingo/migrations/0008_auto_20150908_1538.py index d88b3df3..1678bffc 100644 --- a/combo/apps/lingo/migrations/0008_auto_20150908_1538.py +++ b/combo/apps/lingo/migrations/0008_auto_20150908_1538.py @@ -25,7 +25,7 @@ class Migration(migrations.Migration): ('regie', models.CharField(max_length=50, verbose_name='Regie', blank=True)), ('title', ckeditor.fields.RichTextField(verbose_name='Title', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Active Items Cell', @@ -43,7 +43,7 @@ class Migration(migrations.Migration): ('regie', models.CharField(max_length=50, verbose_name='Regie', blank=True)), ('title', ckeditor.fields.RichTextField(verbose_name='Title', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Items History Cell', diff --git a/combo/apps/lingo/migrations/0009_auto_20150917_1456.py b/combo/apps/lingo/migrations/0009_auto_20150917_1456.py index 29f5dd9c..f67ad490 100644 --- a/combo/apps/lingo/migrations/0009_auto_20150917_1456.py +++ b/combo/apps/lingo/migrations/0009_auto_20150917_1456.py @@ -15,7 +15,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='transaction', name='regie', - field=models.ForeignKey(to='lingo.Regie', null=True), + field=models.ForeignKey(to='lingo.Regie', null=True, on_delete=models.CASCADE), preserve_default=True, ), migrations.AddField( @@ -27,7 +27,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='transaction', 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=True, ), ] diff --git a/combo/apps/lingo/migrations/0021_transactionoperation.py b/combo/apps/lingo/migrations/0021_transactionoperation.py index f0637c24..5c81e49d 100644 --- a/combo/apps/lingo/migrations/0021_transactionoperation.py +++ b/combo/apps/lingo/migrations/0021_transactionoperation.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('amount', models.DecimalField(max_digits=8, decimal_places=2)), ('creation_date', models.DateTimeField(auto_now_add=True)), ('bank_result', jsonfield.fields.JSONField(default=dict, blank=True)), - ('transaction', models.ForeignKey(to='lingo.Transaction')), + ('transaction', models.ForeignKey(to='lingo.Transaction', on_delete=models.CASCADE)), ], ), ] diff --git a/combo/apps/lingo/migrations/0024_selfdeclaredinvoicepayment.py b/combo/apps/lingo/migrations/0024_selfdeclaredinvoicepayment.py index cfb06c59..34a4fe49 100644 --- a/combo/apps/lingo/migrations/0024_selfdeclaredinvoicepayment.py +++ b/combo/apps/lingo/migrations/0024_selfdeclaredinvoicepayment.py @@ -27,7 +27,7 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=200, verbose_name='Title', blank=True)), ('text', ckeditor.fields.RichTextField(null=True, verbose_name='Text', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Self declared invoice payment', diff --git a/combo/apps/lingo/migrations/0025_auto_20161206_1713.py b/combo/apps/lingo/migrations/0025_auto_20161206_1713.py index 70214961..6b01fc78 100644 --- a/combo/apps/lingo/migrations/0025_auto_20161206_1713.py +++ b/combo/apps/lingo/migrations/0025_auto_20161206_1713.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='basketitem', 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), ), ] diff --git a/combo/apps/lingo/migrations/0028_tipipaymentformcell.py b/combo/apps/lingo/migrations/0028_tipipaymentformcell.py index 93b835ab..63a3ed00 100644 --- a/combo/apps/lingo/migrations/0028_tipipaymentformcell.py +++ b/combo/apps/lingo/migrations/0028_tipipaymentformcell.py @@ -31,7 +31,7 @@ class Migration(migrations.Migration): ('control_protocol', models.CharField(default=b'pesv2', max_length=8, verbose_name='Control protocol', choices=[(b'pesv2', 'Indigo/PES v2'), (b'rolmre', 'ROLMRE')])), ('test_mode', models.BooleanField(default=False, verbose_name='Test mode')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'TIPI Payment Form', diff --git a/combo/apps/lingo/models.py b/combo/apps/lingo/models.py index 95e5f947..b49c1a5c 100644 --- a/combo/apps/lingo/models.py +++ b/combo/apps/lingo/models.py @@ -328,8 +328,8 @@ class Regie(models.Model): class BasketItem(models.Model): - user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True) - regie = models.ForeignKey(Regie) + user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True) + regie = models.ForeignKey(Regie, on_delete=models.CASCADE) subject = models.CharField(verbose_name=_('Subject'), max_length=200) source_url = models.URLField(_('Source URL'), blank=True) details = models.TextField(verbose_name=_('Details'), blank=True) @@ -427,7 +427,7 @@ class RemoteItem(object): class Transaction(models.Model): - regie = models.ForeignKey(Regie, null=True) + regie = models.ForeignKey(Regie, on_delete=models.CASCADE, null=True) items = models.ManyToManyField(BasketItem, blank=True) remote_items = models.CharField(max_length=512) to_be_paid_remote_items = models.CharField(max_length=512, null=True) @@ -436,7 +436,7 @@ class Transaction(models.Model): bank_data = JSONField(blank=True) order_id = models.CharField(max_length=200) bank_transaction_id = models.CharField(max_length=200, null=True) - user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True) + user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True) status = models.IntegerField(null=True) amount = models.DecimalField(default=0, max_digits=7, decimal_places=2) @@ -504,7 +504,7 @@ class TransactionOperation(models.Model): ('validation', _('Validation')), ('cancellation', _('Cancellation')), ] - transaction = models.ForeignKey(Transaction) + transaction = models.ForeignKey(Transaction, on_delete=models.CASCADE) kind = models.CharField(max_length=65, choices=OPERATIONS) amount = models.DecimalField(decimal_places=2, max_digits=8) creation_date = models.DateTimeField(auto_now_add=True) diff --git a/combo/apps/maps/migrations/0002_map.py b/combo/apps/maps/migrations/0002_map.py index de86c1e0..fe40bb63 100644 --- a/combo/apps/maps/migrations/0002_map.py +++ b/combo/apps/maps/migrations/0002_map.py @@ -30,7 +30,7 @@ class Migration(migrations.Migration): ('max_zoom', models.CharField(default=19, max_length=2, verbose_name='Maximal zoom level', choices=[(b'0', 'Whole world'), (b'9', 'Wide area'), (b'11', 'Area'), (b'13', 'Town'), (b'16', 'Small road'), (b'18', 'Neighbourhood'), (b'19', 'Ant')])), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), ('layers', models.ManyToManyField(to='maps.MapLayer', verbose_name='Layers', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Map', diff --git a/combo/apps/newsletters/migrations/0001_initial.py b/combo/apps/newsletters/migrations/0001_initial.py index af7b209e..74f5fba1 100644 --- a/combo/apps/newsletters/migrations/0001_initial.py +++ b/combo/apps/newsletters/migrations/0001_initial.py @@ -26,7 +26,7 @@ class Migration(migrations.Migration): ('resources_restrictions', models.CharField(help_text='list of resources(themes) separated by commas', max_length=1024, verbose_name='resources restrictions', blank=True)), ('transports_restrictions', models.CharField(help_text='list of transports separated by commas', max_length=1024, verbose_name='transports restrictions', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Newsletters', diff --git a/combo/apps/notifications/migrations/0001_initial.py b/combo/apps/notifications/migrations/0001_initial.py index 838389c2..4d33b0a6 100644 --- a/combo/apps/notifications/migrations/0001_initial.py +++ b/combo/apps/notifications/migrations/0001_initial.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('end_timestamp', models.DateTimeField(verbose_name='End date and time')), ('acked', models.BooleanField(default=False, verbose_name='Acked')), ('external_id', models.SlugField(null=True, verbose_name='External identifier')), - ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Notification', @@ -41,7 +41,7 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=True, verbose_name='Public')), ('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'User Notifications', diff --git a/combo/apps/pwa/models.py b/combo/apps/pwa/models.py index 997f784b..49afb5e9 100644 --- a/combo/apps/pwa/models.py +++ b/combo/apps/pwa/models.py @@ -104,8 +104,9 @@ class PwaSettings(models.Model): class PwaNavigationEntry(models.Model): label = models.CharField(verbose_name=_('Label'), max_length=150, blank=True) url = models.CharField(verbose_name=_('External URL'), max_length=200, blank=True) - link_page = models.ForeignKey('data.Page', blank=True, - null=True, verbose_name=_('Internal link')) + link_page = models.ForeignKey( + 'data.Page', on_delete=models.CASCADE, blank=True, + null=True, verbose_name=_('Internal link')) icon = models.FileField(_('Icon'), upload_to='pwa', blank=True, null=True) extra_css_class = models.CharField(_('Extra classes for CSS styling'), max_length=100, blank=True) order = models.PositiveIntegerField() diff --git a/combo/apps/search/migrations/0001_initial.py b/combo/apps/search/migrations/0001_initial.py index 23f780a7..d79a7d0c 100644 --- a/combo/apps/search/migrations/0001_initial.py +++ b/combo/apps/search/migrations/0001_initial.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('last_update_timestamp', models.DateTimeField(auto_now=True)), ('_search_service', models.CharField(max_length=64, verbose_name='Search Service')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Search', diff --git a/combo/apps/usersearch/migrations/0001_initial.py b/combo/apps/usersearch/migrations/0001_initial.py index 88732871..ecbeb545 100644 --- a/combo/apps/usersearch/migrations/0001_initial.py +++ b/combo/apps/usersearch/migrations/0001_initial.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=True, verbose_name='Public')), ('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'User Search', diff --git a/combo/apps/wcs/migrations/0001_initial.py b/combo/apps/wcs/migrations/0001_initial.py index b958e06f..de28a321 100644 --- a/combo/apps/wcs/migrations/0001_initial.py +++ b/combo/apps/wcs/migrations/0001_initial.py @@ -25,8 +25,8 @@ class Migration(migrations.Migration): ('cached_description', models.TextField(verbose_name='Description', blank=True)), ('cached_url', models.URLField(verbose_name='Cached URL')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('link_page', models.ForeignKey(related_name='link', to='data.Page', null=True)), - ('page', models.ForeignKey(to='data.Page')), + ('link_page', models.ForeignKey(related_name='link', to='data.Page', null=True, on_delete=models.CASCADE)), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Category Link', @@ -42,7 +42,7 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=True, verbose_name='Public')), ('wcs_site', models.CharField(max_length=50, verbose_name='Site')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Current Drafts', @@ -58,7 +58,7 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=True, verbose_name='Public')), ('wcs_site', models.CharField(max_length=50, verbose_name='Site')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Current Forms', @@ -76,7 +76,7 @@ class Migration(migrations.Migration): ('cached_title', models.CharField(max_length=50, verbose_name='Title')), ('cached_url', models.URLField(verbose_name='URL')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Form Link', @@ -97,7 +97,7 @@ class Migration(migrations.Migration): ('ordering', models.CharField(default=b'', max_length=20, verbose_name='Order', blank=True, choices=[(b'', 'Default'), (b'alpha', 'Alphabetical'), (b'popularity', 'Popularity')])), ('limit', models.PositiveSmallIntegerField(null=True, verbose_name='Limit', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Forms of Category', diff --git a/combo/apps/wcs/migrations/0006_categoriescell.py b/combo/apps/wcs/migrations/0006_categoriescell.py index 67fbb4f1..f2200f83 100644 --- a/combo/apps/wcs/migrations/0006_categoriescell.py +++ b/combo/apps/wcs/migrations/0006_categoriescell.py @@ -24,7 +24,7 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=True, verbose_name='Public')), ('wcs_site', models.CharField(max_length=50, verbose_name='Site', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Form Categories', diff --git a/combo/apps/wcs/migrations/0007_trackingcodeinputcell.py b/combo/apps/wcs/migrations/0007_trackingcodeinputcell.py index 64f4eb53..3f775694 100644 --- a/combo/apps/wcs/migrations/0007_trackingcodeinputcell.py +++ b/combo/apps/wcs/migrations/0007_trackingcodeinputcell.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=True, verbose_name='Public')), ('wcs_site', models.CharField(max_length=50, verbose_name='Site', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'abstract': False, diff --git a/combo/data/migrations/0001_initial.py b/combo/data/migrations/0001_initial.py index d1b7685d..7d90c6c5 100644 --- a/combo/data/migrations/0001_initial.py +++ b/combo/data/migrations/0001_initial.py @@ -53,7 +53,7 @@ class Migration(migrations.Migration): ('redirect_url', models.CharField(max_length=100, verbose_name='Redirect URL', blank=True)), ('public', models.BooleanField(default=True, verbose_name='Public')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('parent', models.ForeignKey(blank=True, to='data.Page', null=True)), + ('parent', models.ForeignKey(blank=True, to='data.Page', null=True, on_delete=models.CASCADE)), ], options={ 'ordering': ['order'], @@ -69,7 +69,7 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=True, verbose_name='Public')), ('text', ckeditor.fields.RichTextField(null=True, verbose_name='Text')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Text', @@ -84,7 +84,7 @@ class Migration(migrations.Migration): ('order', models.PositiveIntegerField()), ('public', models.BooleanField(default=True, verbose_name='Public')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Unlock Marker', @@ -94,13 +94,13 @@ class Migration(migrations.Migration): migrations.AddField( model_name='fortunecell', name='page', - field=models.ForeignKey(to='data.Page'), + field=models.ForeignKey(to='data.Page', on_delete=models.CASCADE), preserve_default=True, ), migrations.AddField( model_name='blurpcell', name='page', - field=models.ForeignKey(to='data.Page'), + field=models.ForeignKey(to='data.Page', on_delete=models.CASCADE), preserve_default=True, ), ] diff --git a/combo/data/migrations/0003_menucell.py b/combo/data/migrations/0003_menucell.py index e181260d..9f7b954e 100644 --- a/combo/data/migrations/0003_menucell.py +++ b/combo/data/migrations/0003_menucell.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('slug', models.SlugField(verbose_name='Slug', blank=True)), ('public', models.BooleanField(default=True, verbose_name='Public')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Menu', diff --git a/combo/data/migrations/0006_linkcell.py b/combo/data/migrations/0006_linkcell.py index c7a90c57..0f1316e0 100644 --- a/combo/data/migrations/0006_linkcell.py +++ b/combo/data/migrations/0006_linkcell.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=150, verbose_name='Title')), ('url', models.URLField(verbose_name='URL')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Link', diff --git a/combo/data/migrations/0007_auto_20150529_1003.py b/combo/data/migrations/0007_auto_20150529_1003.py index 9a26b341..9a50f1fb 100644 --- a/combo/data/migrations/0007_auto_20150529_1003.py +++ b/combo/data/migrations/0007_auto_20150529_1003.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='linkcell', name='link_page', - field=models.ForeignKey(related_name='link_cell', to='data.Page', null=True), + field=models.ForeignKey(related_name='link_cell', to='data.Page', null=True, on_delete=models.CASCADE), preserve_default=True, ), migrations.AlterField( diff --git a/combo/data/migrations/0008_auto_20150529_1504.py b/combo/data/migrations/0008_auto_20150529_1504.py index 9dae1a69..8b56dfa6 100644 --- a/combo/data/migrations/0008_auto_20150529_1504.py +++ b/combo/data/migrations/0008_auto_20150529_1504.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='linkcell', name='link_page', - field=models.ForeignKey(related_name='link_cell', blank=True, to='data.Page', null=True), + field=models.ForeignKey(related_name='link_cell', blank=True, to='data.Page', null=True, on_delete=models.CASCADE), preserve_default=True, ), ] diff --git a/combo/data/migrations/0009_auto_20150529_2247.py b/combo/data/migrations/0009_auto_20150529_2247.py index 1e3e17b9..68658daf 100644 --- a/combo/data/migrations/0009_auto_20150529_2247.py +++ b/combo/data/migrations/0009_auto_20150529_2247.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='linkcell', name='link_page', - field=models.ForeignKey(related_name='link_cell', verbose_name='Internal link', blank=True, to='data.Page', null=True), + field=models.ForeignKey(related_name='link_cell', verbose_name='Internal link', blank=True, to='data.Page', null=True, on_delete=models.CASCADE), preserve_default=True, ), ] diff --git a/combo/data/migrations/0010_feedcell.py b/combo/data/migrations/0010_feedcell.py index e3df2f22..087cdf93 100644 --- a/combo/data/migrations/0010_feedcell.py +++ b/combo/data/migrations/0010_feedcell.py @@ -22,7 +22,7 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=True, verbose_name='Public')), ('url', models.URLField(verbose_name='URL', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'RSS/Atom Feed', diff --git a/combo/data/migrations/0013_parameterscell.py b/combo/data/migrations/0013_parameterscell.py index ba85d382..24ff4a91 100644 --- a/combo/data/migrations/0013_parameterscell.py +++ b/combo/data/migrations/0013_parameterscell.py @@ -27,7 +27,7 @@ class Migration(migrations.Migration): ('empty_label', models.CharField(default=b'---', max_length=64, verbose_name='Empty label')), ('parameters', jsonfield.fields.JSONField(default=dict, help_text='Must be a JSON list, containing dictionaries with 3 keys: name, value and optionnally roles; name must be a string, value must be a dictionary and roles must a list of role names. Role names limit the visibility of the choice.', verbose_name='Parameters', blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Parameters', diff --git a/combo/data/migrations/0017_menucell_root_page.py b/combo/data/migrations/0017_menucell_root_page.py index 37a378b3..953b2dc0 100644 --- a/combo/data/migrations/0017_menucell_root_page.py +++ b/combo/data/migrations/0017_menucell_root_page.py @@ -14,6 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='menucell', name='root_page', - field=models.ForeignKey(related_name='root_page', verbose_name='Root Page', blank=True, to='data.Page', null=True), + field=models.ForeignKey(related_name='root_page', verbose_name='Root Page', blank=True, to='data.Page', null=True, on_delete=models.CASCADE), ), ] diff --git a/combo/data/migrations/0018_parentcontentcell.py b/combo/data/migrations/0018_parentcontentcell.py index 9b400afb..39bea74b 100644 --- a/combo/data/migrations/0018_parentcontentcell.py +++ b/combo/data/migrations/0018_parentcontentcell.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=True, verbose_name='Public')), ('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'Same as parent', diff --git a/combo/data/migrations/0021_jsoncell.py b/combo/data/migrations/0021_jsoncell.py index 6637d6b4..bbcceff1 100644 --- a/combo/data/migrations/0021_jsoncell.py +++ b/combo/data/migrations/0021_jsoncell.py @@ -27,7 +27,7 @@ class Migration(migrations.Migration): ('template_string', models.TextField(null=True, verbose_name='Display Template', blank=True, validators=[combo.data.models.django_template_validator])), ('cache_duration', models.PositiveIntegerField(default=60, verbose_name='Cache duration')), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'verbose_name': 'JSON Prototype', diff --git a/combo/data/migrations/0024_configjsoncell.py b/combo/data/migrations/0024_configjsoncell.py index 707602dd..15751aae 100644 --- a/combo/data/migrations/0024_configjsoncell.py +++ b/combo/data/migrations/0024_configjsoncell.py @@ -27,7 +27,7 @@ class Migration(migrations.Migration): ('key', models.CharField(max_length=50)), ('parameters', jsonfield.fields.JSONField(default=dict, blank=True)), ('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)), - ('page', models.ForeignKey(to='data.Page')), + ('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)), ], options={ 'abstract': False, diff --git a/combo/data/models.py b/combo/data/models.py index 88ad3b13..0176a55b 100644 --- a/combo/data/models.py +++ b/combo/data/models.py @@ -131,7 +131,7 @@ class Page(models.Model): )) description = models.TextField(_('Description'), blank=True) template_name = models.CharField(_('Template'), max_length=50) - parent = models.ForeignKey('self', null=True, blank=True) + parent = models.ForeignKey('self', on_delete=models.CASCADE, null=True, blank=True) order = models.PositiveIntegerField() exclude_from_navigation = models.BooleanField(_('Exclude from navigation'), default=False) redirect_url = models.CharField(_('Redirect URL'), max_length=200, blank=True) @@ -440,7 +440,7 @@ class Page(models.Model): class PageSnapshot(models.Model): page = models.ForeignKey(Page, on_delete=models.SET_NULL, null=True) timestamp = models.DateTimeField(auto_now_add=True) - user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True) + user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True) comment = models.TextField(blank=True, null=True) serialization = JSONField(blank=True) @@ -477,7 +477,7 @@ class PageSnapshot(models.Model): class Redirect(models.Model): old_url = models.CharField(max_length=512) - page = models.ForeignKey(Page) + page = models.ForeignKey(Page, on_delete=models.CASCADE) creation_timestamp = models.DateTimeField(auto_now_add=True) class Meta: @@ -491,7 +491,7 @@ class CellMeta(MediaDefiningClass, ModelBase): @python_2_unicode_compatible class CellBase(six.with_metaclass(CellMeta, models.Model)): - page = models.ForeignKey(Page) + page = models.ForeignKey(Page, on_delete=models.CASCADE) placeholder = models.CharField(max_length=20) order = models.PositiveIntegerField() slug = models.SlugField(_('Slug'), blank=True) @@ -830,7 +830,7 @@ class MenuCell(CellBase): initial_level = models.IntegerField(_('Initial Level'), choices=[(-1, _('Same as page'))] + [(i, i) for i in range(1, 3)], default=-1, null=False) - root_page = models.ForeignKey(Page, related_name='root_page', + root_page = models.ForeignKey(Page, on_delete=models.CASCADE, related_name='root_page', null=True, blank=True, verbose_name=_('Root Page')) template_name = 'combo/menu-cell.html' @@ -858,8 +858,9 @@ class MenuCell(CellBase): class LinkCell(CellBase): title = models.CharField(_('Title'), max_length=150, blank=True) url = models.CharField(_('URL'), max_length=200, blank=True) - link_page = models.ForeignKey('data.Page', related_name='link_cell', blank=True, - null=True, verbose_name=_('Internal link')) + link_page = models.ForeignKey( + 'data.Page', on_delete=models.CASCADE, related_name='link_cell', blank=True, + null=True, verbose_name=_('Internal link')) anchor = models.CharField(_('Anchor'), max_length=150, blank=True) template_name = 'combo/link-cell.html' diff --git a/combo/profile/migrations/0001_initial.py b/combo/profile/migrations/0001_initial.py index 2bc48913..11dc6680 100644 --- a/combo/profile/migrations/0001_initial.py +++ b/combo/profile/migrations/0001_initial.py @@ -17,7 +17,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('initial_login_view_timestamp', models.DateTimeField(null=True)), - ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)), + ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)), ], ), ] diff --git a/combo/profile/models.py b/combo/profile/models.py index 229b0c64..1bcc84de 100644 --- a/combo/profile/models.py +++ b/combo/profile/models.py @@ -27,7 +27,7 @@ from combo.data.library import register_cell_class class Profile(models.Model): - user = models.OneToOneField(settings.AUTH_USER_MODEL) + user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) initial_login_view_timestamp = models.DateTimeField(null=True)