dj2: add explicit on_delete on all ForeignKey (#36895)
remove RemovedInDjango20Warning: on_delete will be a required arg for ForeignKey in Django 2.0. Set it to models.CASCADE on models and in existing migrations if you want to maintain the current default behavior. See https://docs.djangoproject.com/en/1.11/ref/models/ fields/#django.db.models.ForeignKey.on_delete
This commit is contained in:
parent
94d25e1cd5
commit
49830fc9c5
|
@ -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')),
|
('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')),
|
('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)),
|
('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={
|
options={
|
||||||
'verbose_name': 'Booking Calendar',
|
'verbose_name': 'Booking Calendar',
|
||||||
|
|
|
@ -27,7 +27,7 @@ class Migration(migrations.Migration):
|
||||||
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
||||||
('last_update_timestamp', models.DateTimeField(auto_now=True)),
|
('last_update_timestamp', models.DateTimeField(auto_now=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Dashboard',
|
'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)),
|
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||||
('cell_pk', models.PositiveIntegerField()),
|
('cell_pk', models.PositiveIntegerField()),
|
||||||
('order', models.PositiveIntegerField()),
|
('order', models.PositiveIntegerField()),
|
||||||
('cell_type', models.ForeignKey(to='contenttypes.ContentType')),
|
('cell_type', models.ForeignKey(to='contenttypes.ContentType', on_delete=models.CASCADE)),
|
||||||
('dashboard', models.ForeignKey(to='dashboard.DashboardCell')),
|
('dashboard', models.ForeignKey(to='dashboard.DashboardCell', on_delete=models.CASCADE)),
|
||||||
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
|
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'ordering': ('order',),
|
'ordering': ('order',),
|
||||||
|
|
|
@ -50,11 +50,11 @@ class DashboardCell(CellBase):
|
||||||
|
|
||||||
|
|
||||||
class Tile(models.Model):
|
class Tile(models.Model):
|
||||||
dashboard = models.ForeignKey(DashboardCell)
|
dashboard = models.ForeignKey(DashboardCell, on_delete=models.CASCADE)
|
||||||
cell_type = models.ForeignKey(ContentType)
|
cell_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
|
||||||
cell_pk = models.PositiveIntegerField()
|
cell_pk = models.PositiveIntegerField()
|
||||||
cell = fields.GenericForeignKey('cell_type', 'cell_pk')
|
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()
|
order = models.IntegerField()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
|
|
@ -26,7 +26,7 @@ class Migration(migrations.Migration):
|
||||||
('data_source', models.CharField(max_length=150, null=True, verbose_name='Data Source', blank=True)),
|
('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)),
|
('max_value', models.PositiveIntegerField(null=True, verbose_name='Max Value', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Gauge',
|
'verbose_name': 'Gauge',
|
||||||
|
|
|
@ -30,7 +30,7 @@ class Migration(migrations.Migration):
|
||||||
('drilldown2', models.CharField(max_length=64, null=True, verbose_name='Drilldown 2', blank=True)),
|
('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)),
|
('other_parameters', models.TextField(null=True, verbose_name='Other parameters', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Cubes Barchart',
|
'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)),
|
('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)),
|
('other_parameters', models.TextField(null=True, verbose_name='Other parameters', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Cubes Table',
|
'verbose_name': 'Cubes Table',
|
||||||
|
|
|
@ -25,7 +25,7 @@ class Migration(migrations.Migration):
|
||||||
('title', models.CharField(max_length=150, null=True, verbose_name='Title', blank=True)),
|
('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)),
|
('url', models.URLField(max_length=150, null=True, verbose_name='URL', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Chart',
|
'verbose_name': 'Chart',
|
||||||
|
|
|
@ -22,7 +22,7 @@ class Migration(migrations.Migration):
|
||||||
('slug', models.SlugField(verbose_name='Slug', blank=True)),
|
('slug', models.SlugField(verbose_name='Slug', blank=True)),
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Family Information Cell',
|
'verbose_name': 'Family Information Cell',
|
||||||
|
|
|
@ -22,7 +22,7 @@ class Migration(migrations.Migration):
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Recent Documents',
|
'verbose_name': 'Recent Documents',
|
||||||
|
|
|
@ -24,7 +24,7 @@ class Migration(migrations.Migration):
|
||||||
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
||||||
('last_update_timestamp', models.DateTimeField(auto_now=True)),
|
('last_update_timestamp', models.DateTimeField(auto_now=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Gallery',
|
'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)),
|
('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')),
|
('image', models.ImageField(upload_to=b'uploads/gallery/%Y/%m/', verbose_name='Image')),
|
||||||
('order', models.PositiveIntegerField()),
|
('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={
|
options={
|
||||||
'ordering': ['order'],
|
'ordering': ['order'],
|
||||||
|
|
|
@ -50,7 +50,7 @@ class GalleryCell(CellBase):
|
||||||
|
|
||||||
|
|
||||||
class Image(models.Model):
|
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'),
|
image = models.ImageField(_('Image'),
|
||||||
upload_to='uploads/gallery/%Y/%m/')
|
upload_to='uploads/gallery/%Y/%m/')
|
||||||
order = models.PositiveIntegerField()
|
order = models.PositiveIntegerField()
|
||||||
|
|
|
@ -40,7 +40,7 @@ class Migration(migrations.Migration):
|
||||||
('slug', models.SlugField(verbose_name='Slug', blank=True)),
|
('slug', models.SlugField(verbose_name='Slug', blank=True)),
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Basket',
|
'verbose_name': 'Basket',
|
||||||
|
@ -65,13 +65,13 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='basketitem',
|
model_name='basketitem',
|
||||||
name='regie',
|
name='regie',
|
||||||
field=models.ForeignKey(to='lingo.Regie'),
|
field=models.ForeignKey(to='lingo.Regie', on_delete=models.CASCADE),
|
||||||
preserve_default=True,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='basketitem',
|
model_name='basketitem',
|
||||||
name='user',
|
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,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -24,7 +24,7 @@ class Migration(migrations.Migration):
|
||||||
('slug', models.SlugField(verbose_name='Slug', blank=True)),
|
('slug', models.SlugField(verbose_name='Slug', blank=True)),
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Recent Transactions',
|
'verbose_name': 'Recent Transactions',
|
||||||
|
@ -34,7 +34,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='transaction',
|
model_name='transaction',
|
||||||
name='user',
|
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,
|
preserve_default=False,
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -22,7 +22,7 @@ class Migration(migrations.Migration):
|
||||||
('slug', models.SlugField(verbose_name='Slug', blank=True)),
|
('slug', models.SlugField(verbose_name='Slug', blank=True)),
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Basket Link',
|
'verbose_name': 'Basket Link',
|
||||||
|
|
|
@ -25,7 +25,7 @@ class Migration(migrations.Migration):
|
||||||
('regie', models.CharField(max_length=50, verbose_name='Regie', blank=True)),
|
('regie', models.CharField(max_length=50, verbose_name='Regie', blank=True)),
|
||||||
('title', ckeditor.fields.RichTextField(verbose_name='Title', blank=True)),
|
('title', ckeditor.fields.RichTextField(verbose_name='Title', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Active Items Cell',
|
'verbose_name': 'Active Items Cell',
|
||||||
|
@ -43,7 +43,7 @@ class Migration(migrations.Migration):
|
||||||
('regie', models.CharField(max_length=50, verbose_name='Regie', blank=True)),
|
('regie', models.CharField(max_length=50, verbose_name='Regie', blank=True)),
|
||||||
('title', ckeditor.fields.RichTextField(verbose_name='Title', blank=True)),
|
('title', ckeditor.fields.RichTextField(verbose_name='Title', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Items History Cell',
|
'verbose_name': 'Items History Cell',
|
||||||
|
|
|
@ -15,7 +15,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='transaction',
|
model_name='transaction',
|
||||||
name='regie',
|
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,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
|
@ -27,7 +27,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.AlterField(
|
migrations.AlterField(
|
||||||
model_name='transaction',
|
model_name='transaction',
|
||||||
name='user',
|
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,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -20,7 +20,7 @@ class Migration(migrations.Migration):
|
||||||
('amount', models.DecimalField(max_digits=8, decimal_places=2)),
|
('amount', models.DecimalField(max_digits=8, decimal_places=2)),
|
||||||
('creation_date', models.DateTimeField(auto_now_add=True)),
|
('creation_date', models.DateTimeField(auto_now_add=True)),
|
||||||
('bank_result', jsonfield.fields.JSONField(default=dict, blank=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)),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -27,7 +27,7 @@ class Migration(migrations.Migration):
|
||||||
('title', models.CharField(max_length=200, verbose_name='Title', blank=True)),
|
('title', models.CharField(max_length=200, verbose_name='Title', blank=True)),
|
||||||
('text', ckeditor.fields.RichTextField(null=True, verbose_name='Text', blank=True)),
|
('text', ckeditor.fields.RichTextField(null=True, verbose_name='Text', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Self declared invoice payment',
|
'verbose_name': 'Self declared invoice payment',
|
||||||
|
|
|
@ -15,6 +15,6 @@ class Migration(migrations.Migration):
|
||||||
migrations.AlterField(
|
migrations.AlterField(
|
||||||
model_name='basketitem',
|
model_name='basketitem',
|
||||||
name='user',
|
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),
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -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')])),
|
('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')),
|
('test_mode', models.BooleanField(default=False, verbose_name='Test mode')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'TIPI Payment Form',
|
'verbose_name': 'TIPI Payment Form',
|
||||||
|
|
|
@ -328,8 +328,8 @@ class Regie(models.Model):
|
||||||
|
|
||||||
|
|
||||||
class BasketItem(models.Model):
|
class BasketItem(models.Model):
|
||||||
user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True)
|
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True)
|
||||||
regie = models.ForeignKey(Regie)
|
regie = models.ForeignKey(Regie, on_delete=models.CASCADE)
|
||||||
subject = models.CharField(verbose_name=_('Subject'), max_length=200)
|
subject = models.CharField(verbose_name=_('Subject'), max_length=200)
|
||||||
source_url = models.URLField(_('Source URL'), blank=True)
|
source_url = models.URLField(_('Source URL'), blank=True)
|
||||||
details = models.TextField(verbose_name=_('Details'), blank=True)
|
details = models.TextField(verbose_name=_('Details'), blank=True)
|
||||||
|
@ -427,7 +427,7 @@ class RemoteItem(object):
|
||||||
|
|
||||||
|
|
||||||
class Transaction(models.Model):
|
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)
|
items = models.ManyToManyField(BasketItem, blank=True)
|
||||||
remote_items = models.CharField(max_length=512)
|
remote_items = models.CharField(max_length=512)
|
||||||
to_be_paid_remote_items = models.CharField(max_length=512, null=True)
|
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)
|
bank_data = JSONField(blank=True)
|
||||||
order_id = models.CharField(max_length=200)
|
order_id = models.CharField(max_length=200)
|
||||||
bank_transaction_id = models.CharField(max_length=200, null=True)
|
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)
|
status = models.IntegerField(null=True)
|
||||||
amount = models.DecimalField(default=0, max_digits=7, decimal_places=2)
|
amount = models.DecimalField(default=0, max_digits=7, decimal_places=2)
|
||||||
|
|
||||||
|
@ -504,7 +504,7 @@ class TransactionOperation(models.Model):
|
||||||
('validation', _('Validation')),
|
('validation', _('Validation')),
|
||||||
('cancellation', _('Cancellation')),
|
('cancellation', _('Cancellation')),
|
||||||
]
|
]
|
||||||
transaction = models.ForeignKey(Transaction)
|
transaction = models.ForeignKey(Transaction, on_delete=models.CASCADE)
|
||||||
kind = models.CharField(max_length=65, choices=OPERATIONS)
|
kind = models.CharField(max_length=65, choices=OPERATIONS)
|
||||||
amount = models.DecimalField(decimal_places=2, max_digits=8)
|
amount = models.DecimalField(decimal_places=2, max_digits=8)
|
||||||
creation_date = models.DateTimeField(auto_now_add=True)
|
creation_date = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
|
@ -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')])),
|
('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)),
|
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)),
|
||||||
('layers', models.ManyToManyField(to='maps.MapLayer', verbose_name='Layers', 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={
|
options={
|
||||||
'verbose_name': 'Map',
|
'verbose_name': 'Map',
|
||||||
|
|
|
@ -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)),
|
('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)),
|
('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)),
|
('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={
|
options={
|
||||||
'verbose_name': 'Newsletters',
|
'verbose_name': 'Newsletters',
|
||||||
|
|
|
@ -24,7 +24,7 @@ class Migration(migrations.Migration):
|
||||||
('end_timestamp', models.DateTimeField(verbose_name='End date and time')),
|
('end_timestamp', models.DateTimeField(verbose_name='End date and time')),
|
||||||
('acked', models.BooleanField(default=False, verbose_name='Acked')),
|
('acked', models.BooleanField(default=False, verbose_name='Acked')),
|
||||||
('external_id', models.SlugField(null=True, verbose_name='External identifier')),
|
('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={
|
options={
|
||||||
'verbose_name': 'Notification',
|
'verbose_name': 'Notification',
|
||||||
|
@ -41,7 +41,7 @@ class Migration(migrations.Migration):
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'User Notifications',
|
'verbose_name': 'User Notifications',
|
||||||
|
|
|
@ -104,8 +104,9 @@ class PwaSettings(models.Model):
|
||||||
class PwaNavigationEntry(models.Model):
|
class PwaNavigationEntry(models.Model):
|
||||||
label = models.CharField(verbose_name=_('Label'), max_length=150, blank=True)
|
label = models.CharField(verbose_name=_('Label'), max_length=150, blank=True)
|
||||||
url = models.CharField(verbose_name=_('External URL'), max_length=200, blank=True)
|
url = models.CharField(verbose_name=_('External URL'), max_length=200, blank=True)
|
||||||
link_page = models.ForeignKey('data.Page', blank=True,
|
link_page = models.ForeignKey(
|
||||||
null=True, verbose_name=_('Internal link'))
|
'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)
|
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)
|
extra_css_class = models.CharField(_('Extra classes for CSS styling'), max_length=100, blank=True)
|
||||||
order = models.PositiveIntegerField()
|
order = models.PositiveIntegerField()
|
||||||
|
|
|
@ -24,7 +24,7 @@ class Migration(migrations.Migration):
|
||||||
('last_update_timestamp', models.DateTimeField(auto_now=True)),
|
('last_update_timestamp', models.DateTimeField(auto_now=True)),
|
||||||
('_search_service', models.CharField(max_length=64, verbose_name='Search Service')),
|
('_search_service', models.CharField(max_length=64, verbose_name='Search Service')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Search',
|
'verbose_name': 'Search',
|
||||||
|
|
|
@ -22,7 +22,7 @@ class Migration(migrations.Migration):
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'User Search',
|
'verbose_name': 'User Search',
|
||||||
|
|
|
@ -25,8 +25,8 @@ class Migration(migrations.Migration):
|
||||||
('cached_description', models.TextField(verbose_name='Description', blank=True)),
|
('cached_description', models.TextField(verbose_name='Description', blank=True)),
|
||||||
('cached_url', models.URLField(verbose_name='Cached URL')),
|
('cached_url', models.URLField(verbose_name='Cached URL')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)),
|
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)),
|
||||||
('link_page', models.ForeignKey(related_name='link', to='data.Page', null=True)),
|
('link_page', models.ForeignKey(related_name='link', to='data.Page', null=True, on_delete=models.CASCADE)),
|
||||||
('page', models.ForeignKey(to='data.Page')),
|
('page', models.ForeignKey(to='data.Page', on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'verbose_name': 'Category Link',
|
'verbose_name': 'Category Link',
|
||||||
|
@ -42,7 +42,7 @@ class Migration(migrations.Migration):
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('wcs_site', models.CharField(max_length=50, verbose_name='Site')),
|
('wcs_site', models.CharField(max_length=50, verbose_name='Site')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Current Drafts',
|
'verbose_name': 'Current Drafts',
|
||||||
|
@ -58,7 +58,7 @@ class Migration(migrations.Migration):
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('wcs_site', models.CharField(max_length=50, verbose_name='Site')),
|
('wcs_site', models.CharField(max_length=50, verbose_name='Site')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Current Forms',
|
'verbose_name': 'Current Forms',
|
||||||
|
@ -76,7 +76,7 @@ class Migration(migrations.Migration):
|
||||||
('cached_title', models.CharField(max_length=50, verbose_name='Title')),
|
('cached_title', models.CharField(max_length=50, verbose_name='Title')),
|
||||||
('cached_url', models.URLField(verbose_name='URL')),
|
('cached_url', models.URLField(verbose_name='URL')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Form Link',
|
'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')])),
|
('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)),
|
('limit', models.PositiveSmallIntegerField(null=True, verbose_name='Limit', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Forms of Category',
|
'verbose_name': 'Forms of Category',
|
||||||
|
|
|
@ -24,7 +24,7 @@ class Migration(migrations.Migration):
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('wcs_site', models.CharField(max_length=50, verbose_name='Site', blank=True)),
|
('wcs_site', models.CharField(max_length=50, verbose_name='Site', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Form Categories',
|
'verbose_name': 'Form Categories',
|
||||||
|
|
|
@ -23,7 +23,7 @@ class Migration(migrations.Migration):
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('wcs_site', models.CharField(max_length=50, verbose_name='Site', blank=True)),
|
('wcs_site', models.CharField(max_length=50, verbose_name='Site', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'abstract': False,
|
'abstract': False,
|
||||||
|
|
|
@ -53,7 +53,7 @@ class Migration(migrations.Migration):
|
||||||
('redirect_url', models.CharField(max_length=100, verbose_name='Redirect URL', blank=True)),
|
('redirect_url', models.CharField(max_length=100, verbose_name='Redirect URL', blank=True)),
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', blank=True)),
|
('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={
|
options={
|
||||||
'ordering': ['order'],
|
'ordering': ['order'],
|
||||||
|
@ -69,7 +69,7 @@ class Migration(migrations.Migration):
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('text', ckeditor.fields.RichTextField(null=True, verbose_name='Text')),
|
('text', ckeditor.fields.RichTextField(null=True, verbose_name='Text')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Text',
|
'verbose_name': 'Text',
|
||||||
|
@ -84,7 +84,7 @@ class Migration(migrations.Migration):
|
||||||
('order', models.PositiveIntegerField()),
|
('order', models.PositiveIntegerField()),
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Unlock Marker',
|
'verbose_name': 'Unlock Marker',
|
||||||
|
@ -94,13 +94,13 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='fortunecell',
|
model_name='fortunecell',
|
||||||
name='page',
|
name='page',
|
||||||
field=models.ForeignKey(to='data.Page'),
|
field=models.ForeignKey(to='data.Page', on_delete=models.CASCADE),
|
||||||
preserve_default=True,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='blurpcell',
|
model_name='blurpcell',
|
||||||
name='page',
|
name='page',
|
||||||
field=models.ForeignKey(to='data.Page'),
|
field=models.ForeignKey(to='data.Page', on_delete=models.CASCADE),
|
||||||
preserve_default=True,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -21,7 +21,7 @@ class Migration(migrations.Migration):
|
||||||
('slug', models.SlugField(verbose_name='Slug', blank=True)),
|
('slug', models.SlugField(verbose_name='Slug', blank=True)),
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Menu',
|
'verbose_name': 'Menu',
|
||||||
|
|
|
@ -23,7 +23,7 @@ class Migration(migrations.Migration):
|
||||||
('title', models.CharField(max_length=150, verbose_name='Title')),
|
('title', models.CharField(max_length=150, verbose_name='Title')),
|
||||||
('url', models.URLField(verbose_name='URL')),
|
('url', models.URLField(verbose_name='URL')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Link',
|
'verbose_name': 'Link',
|
||||||
|
|
|
@ -20,7 +20,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='linkcell',
|
model_name='linkcell',
|
||||||
name='link_page',
|
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,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
migrations.AlterField(
|
migrations.AlterField(
|
||||||
|
|
|
@ -14,7 +14,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.AlterField(
|
migrations.AlterField(
|
||||||
model_name='linkcell',
|
model_name='linkcell',
|
||||||
name='link_page',
|
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,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -14,7 +14,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.AlterField(
|
migrations.AlterField(
|
||||||
model_name='linkcell',
|
model_name='linkcell',
|
||||||
name='link_page',
|
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,
|
preserve_default=True,
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -22,7 +22,7 @@ class Migration(migrations.Migration):
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('url', models.URLField(verbose_name='URL', blank=True)),
|
('url', models.URLField(verbose_name='URL', blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'RSS/Atom Feed',
|
'verbose_name': 'RSS/Atom Feed',
|
||||||
|
|
|
@ -27,7 +27,7 @@ class Migration(migrations.Migration):
|
||||||
('empty_label', models.CharField(default=b'---', max_length=64, verbose_name='Empty label')),
|
('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)),
|
('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)),
|
('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={
|
options={
|
||||||
'verbose_name': 'Parameters',
|
'verbose_name': 'Parameters',
|
||||||
|
|
|
@ -14,6 +14,6 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='menucell',
|
model_name='menucell',
|
||||||
name='root_page',
|
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),
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -21,7 +21,7 @@ class Migration(migrations.Migration):
|
||||||
('public', models.BooleanField(default=True, verbose_name='Public')),
|
('public', models.BooleanField(default=True, verbose_name='Public')),
|
||||||
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
('restricted_to_unlogged', models.BooleanField(default=False, verbose_name='Restrict to unlogged users')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'Same as parent',
|
'verbose_name': 'Same as parent',
|
||||||
|
|
|
@ -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])),
|
('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')),
|
('cache_duration', models.PositiveIntegerField(default=60, verbose_name='Cache duration')),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'verbose_name': 'JSON Prototype',
|
'verbose_name': 'JSON Prototype',
|
||||||
|
|
|
@ -27,7 +27,7 @@ class Migration(migrations.Migration):
|
||||||
('key', models.CharField(max_length=50)),
|
('key', models.CharField(max_length=50)),
|
||||||
('parameters', jsonfield.fields.JSONField(default=dict, blank=True)),
|
('parameters', jsonfield.fields.JSONField(default=dict, blank=True)),
|
||||||
('groups', models.ManyToManyField(to='auth.Group', verbose_name='Groups', 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={
|
options={
|
||||||
'abstract': False,
|
'abstract': False,
|
||||||
|
|
|
@ -131,7 +131,7 @@ class Page(models.Model):
|
||||||
))
|
))
|
||||||
description = models.TextField(_('Description'), blank=True)
|
description = models.TextField(_('Description'), blank=True)
|
||||||
template_name = models.CharField(_('Template'), max_length=50)
|
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()
|
order = models.PositiveIntegerField()
|
||||||
exclude_from_navigation = models.BooleanField(_('Exclude from navigation'), default=False)
|
exclude_from_navigation = models.BooleanField(_('Exclude from navigation'), default=False)
|
||||||
redirect_url = models.CharField(_('Redirect URL'), max_length=200, blank=True)
|
redirect_url = models.CharField(_('Redirect URL'), max_length=200, blank=True)
|
||||||
|
@ -440,7 +440,7 @@ class Page(models.Model):
|
||||||
class PageSnapshot(models.Model):
|
class PageSnapshot(models.Model):
|
||||||
page = models.ForeignKey(Page, on_delete=models.SET_NULL, null=True)
|
page = models.ForeignKey(Page, on_delete=models.SET_NULL, null=True)
|
||||||
timestamp = models.DateTimeField(auto_now_add=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)
|
comment = models.TextField(blank=True, null=True)
|
||||||
serialization = JSONField(blank=True)
|
serialization = JSONField(blank=True)
|
||||||
|
|
||||||
|
@ -477,7 +477,7 @@ class PageSnapshot(models.Model):
|
||||||
|
|
||||||
class Redirect(models.Model):
|
class Redirect(models.Model):
|
||||||
old_url = models.CharField(max_length=512)
|
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)
|
creation_timestamp = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
@ -491,7 +491,7 @@ class CellMeta(MediaDefiningClass, ModelBase):
|
||||||
@python_2_unicode_compatible
|
@python_2_unicode_compatible
|
||||||
class CellBase(six.with_metaclass(CellMeta, models.Model)):
|
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)
|
placeholder = models.CharField(max_length=20)
|
||||||
order = models.PositiveIntegerField()
|
order = models.PositiveIntegerField()
|
||||||
slug = models.SlugField(_('Slug'), blank=True)
|
slug = models.SlugField(_('Slug'), blank=True)
|
||||||
|
@ -830,7 +830,7 @@ class MenuCell(CellBase):
|
||||||
initial_level = models.IntegerField(_('Initial Level'),
|
initial_level = models.IntegerField(_('Initial Level'),
|
||||||
choices=[(-1, _('Same as page'))] +
|
choices=[(-1, _('Same as page'))] +
|
||||||
[(i, i) for i in range(1, 3)], default=-1, null=False)
|
[(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'))
|
null=True, blank=True, verbose_name=_('Root Page'))
|
||||||
|
|
||||||
template_name = 'combo/menu-cell.html'
|
template_name = 'combo/menu-cell.html'
|
||||||
|
@ -858,8 +858,9 @@ class MenuCell(CellBase):
|
||||||
class LinkCell(CellBase):
|
class LinkCell(CellBase):
|
||||||
title = models.CharField(_('Title'), max_length=150, blank=True)
|
title = models.CharField(_('Title'), max_length=150, blank=True)
|
||||||
url = models.CharField(_('URL'), max_length=200, blank=True)
|
url = models.CharField(_('URL'), max_length=200, blank=True)
|
||||||
link_page = models.ForeignKey('data.Page', related_name='link_cell', blank=True,
|
link_page = models.ForeignKey(
|
||||||
null=True, verbose_name=_('Internal link'))
|
'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)
|
anchor = models.CharField(_('Anchor'), max_length=150, blank=True)
|
||||||
|
|
||||||
template_name = 'combo/link-cell.html'
|
template_name = 'combo/link-cell.html'
|
||||||
|
|
|
@ -17,7 +17,7 @@ class Migration(migrations.Migration):
|
||||||
fields=[
|
fields=[
|
||||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||||
('initial_login_view_timestamp', models.DateTimeField(null=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)),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
|
|
|
@ -27,7 +27,7 @@ from combo.data.library import register_cell_class
|
||||||
|
|
||||||
|
|
||||||
class Profile(models.Model):
|
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)
|
initial_login_view_timestamp = models.DateTimeField(null=True)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue