Skip to content

Add 'on_delete' to Opening/ClosingRules models #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AntoineToubhans wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add 'on_delete' to Opening/ClosingRules models #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c94e9fe
Add 'on_delete' to Opening/ClosingRules models
AntoineToubhans Jan 20, 2018
4a587a4
Fix 0001/0002 migrations when PREMISE_MODEL is not 'openinghours.Comp…
AntoineToubhans Jan 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openinghours/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Migration(migrations.Migration):
('weekday', models.IntegerField(choices=[(1, 'Monday'), (2, 'Tuesday'), (3, 'Wednesday'), (4, 'Thursday'), (5, 'Friday'), (6, 'Saturday'), (7, 'Sunday')])),
('from_hour', models.TimeField()),
('to_hour', models.TimeField()),
('company', models.ForeignKey(to=PREMISES_MODEL)),
('company', models.ForeignKey(to=PREMISES_MODEL, on_delete=models.CASCADE)),
],
options={
'verbose_name': 'Opening Hours',
Expand All @@ -55,6 +55,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='closingrules',
name='company',
field=models.ForeignKey(to=PREMISES_MODEL),
field=models.ForeignKey(to=PREMISES_MODEL, on_delete=models.CASCADE),
),
]
42 changes: 25 additions & 17 deletions openinghours/migrations/0002_auto_20170915_0912.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,28 @@
from __future__ import unicode_literals

from django.db import migrations, models
from openinghours.app_settings import PREMISES_MODEL

if PREMISES_MODEL == 'openinghours.Company':
company_operations = [
migrations.AlterField(
model_name='company',
name='logo',
field=models.FileField(null=True, upload_to=b'logo', verbose_name='Logo', blank=True),
),
migrations.AlterField(
model_name='company',
name='name',
field=models.CharField(max_length=100, verbose_name='Name'),
),
migrations.AlterField(
model_name='company',
name='slug',
field=models.SlugField(verbose_name='Slug', unique=True),
),
]
else:
company_operations = []


class Migration(migrations.Migration):
Expand All @@ -22,7 +44,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='closingrules',
name='company',
field=models.ForeignKey(to='openinghours.Company', verbose_name='Company'),
field=models.ForeignKey(to=PREMISES_MODEL, verbose_name='Company', on_delete=models.CASCADE),
),
migrations.AlterField(
model_name='closingrules',
Expand All @@ -39,25 +61,11 @@ class Migration(migrations.Migration):
name='start',
field=models.DateTimeField(verbose_name='Start'),
),
migrations.AlterField(
model_name='company',
name='logo',
field=models.FileField(null=True, upload_to=b'logo', verbose_name='Logo', blank=True),
),
migrations.AlterField(
model_name='company',
name='name',
field=models.CharField(max_length=100, verbose_name='Name'),
),
migrations.AlterField(
model_name='company',
name='slug',
field=models.SlugField(verbose_name='Slug', unique=True),
),
] + company_operations + [
migrations.AlterField(
model_name='openinghours',
name='company',
field=models.ForeignKey(to='openinghours.Company', verbose_name='Company'),
field=models.ForeignKey(to=PREMISES_MODEL, verbose_name='Company', on_delete=models.CASCADE),
),
migrations.AlterField(
model_name='openinghours',
Expand Down
4 changes: 2 additions & 2 deletions openinghours/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Meta:
verbose_name_plural = _('Opening Hours')
ordering = ['company', 'weekday', 'from_hour']

company = models.ForeignKey(PREMISES_MODEL, verbose_name=_('Company'))
company = models.ForeignKey(PREMISES_MODEL, verbose_name=_('Company'), on_delete=models.CASCADE)
weekday = models.IntegerField(_('Weekday'), choices=WEEKDAYS)
from_hour = models.TimeField(_('Opening'))
to_hour = models.TimeField(_('Closing'))
Expand All @@ -72,7 +72,7 @@ class Meta:
verbose_name_plural = _('Closing Rules')
ordering = ['start']

company = models.ForeignKey(PREMISES_MODEL, verbose_name=_('Company'))
company = models.ForeignKey(PREMISES_MODEL, verbose_name=_('Company'), on_delete=models.CASCADE)
start = models.DateTimeField(_('Start'))
end = models.DateTimeField(_('End'))
reason = models.TextField(_('Reason'), null=True, blank=True)
Expand Down