Skip to content

Commit

Permalink
Fix migration of notification app
Browse files Browse the repository at this point in the history
  • Loading branch information
christophmeissner committed Oct 22, 2015
1 parent 873efd6 commit bee8d01
Show file tree
Hide file tree
Showing 11 changed files with 157 additions and 6 deletions.
2 changes: 1 addition & 1 deletion news/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('slug', models.SlugField(max_length=255, auto_created=True)),
('creation_date', models.DateField(auto_now=True)),
('creation_date', models.DateField(auto_now=True, verbose_name='creation date')),
('title', models.CharField(max_length=255, verbose_name='title')),
('subtitle', models.CharField(max_length=255, null=True, verbose_name='subtitle', blank=True)),
('text', models.TextField(max_length=20055, verbose_name='articletext')),
Expand Down
12 changes: 8 additions & 4 deletions news/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ class News(models.Model):
facilities and organizations can publish news.
TODO: News are shown in appropriate organization templates
"""
creation_date = models.DateField(auto_now=True, verbose_name=_("creation date"))
creation_date = models.DateField(auto_now=True,
verbose_name=_("creation date"))
title = models.CharField(max_length=255, verbose_name=_("title"))
subtitle = models.CharField(max_length=255, verbose_name=_("subtitle"), null=True, blank=True)
subtitle = models.CharField(max_length=255, verbose_name=_("subtitle"),
null=True, blank=True)
text = models.TextField(max_length=20055, verbose_name=_("articletext"))
slug = models.SlugField(auto_created=True, max_length=255)
facility = models.ForeignKey('organizations.Facility', null=True, blank=True)
organization = models.ForeignKey('organizations.Organization', null=True, blank=True)
facility = models.ForeignKey('organizations.Facility', null=True,
blank=True)
organization = models.ForeignKey('organizations.Organization', null=True,
blank=True)

def save(self, *args, **kwargs):
if not self.id:
Expand Down
1 change: 1 addition & 0 deletions notifications/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# coding=utf-8
26 changes: 26 additions & 0 deletions notifications/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

dependencies = [
('scheduler', '0009_auto_20150823_1546'),
]

operations = [
migrations.CreateModel(
name='Notification',
fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('slug', models.SlugField(max_length=255, auto_created=True)),
('creation_date', models.DateField(auto_now=True)),
('title', models.CharField(max_length=255, verbose_name=b'Titel')),
('subtitle', models.CharField(max_length=255, verbose_name=b'Untertitel')),
('text', models.TextField(max_length=20055, verbose_name=b'Artikeltext')),
('location', models.ForeignKey(to='scheduler.Location')),
],
),
]
20 changes: 20 additions & 0 deletions notifications/migrations/0001_squashed_removed.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import migrations


class Migration(migrations.Migration):
replaces = [(b'notifications', '0001_initial'),
(b'notifications', '0002_auto_20150823_1658'),
(b'notifications', '0003_auto_20150912_2049'),
(b'notifications', '0004_auto_20151003_2033'),
(b'notifications', '0005_remove_notification_model')]

dependencies = [
('scheduler', '0009_auto_20150823_1546'),
('organizations', '0002_migrate_locations_to_facilities'),
]

operations = [
]
19 changes: 19 additions & 0 deletions notifications/migrations/0002_auto_20150823_1658.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

dependencies = [
('notifications', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='notification',
name='subtitle',
field=models.CharField(max_length=255, null=True, verbose_name=b'Untertitel', blank=True),
),
]
29 changes: 29 additions & 0 deletions notifications/migrations/0003_auto_20150912_2049.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

dependencies = [
('notifications', '0002_auto_20150823_1658'),
]

operations = [
migrations.AlterField(
model_name='notification',
name='subtitle',
field=models.CharField(max_length=255, null=True, verbose_name='subtitle', blank=True),
),
migrations.AlterField(
model_name='notification',
name='text',
field=models.TextField(max_length=20055, verbose_name='text'),
),
migrations.AlterField(
model_name='notification',
name='title',
field=models.CharField(max_length=255, verbose_name='title'),
),
]
30 changes: 30 additions & 0 deletions notifications/migrations/0004_auto_20151003_2033.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

dependencies = [
('organizations', '0002_migrate_locations_to_facilities'),
('notifications', '0003_auto_20150912_2049'),
]

operations = [
migrations.AlterField(
model_name='notification',
name='location',
field=models.ForeignKey(verbose_name='facility', to='organizations.Facility'),
),
migrations.RenameField(
model_name='notification',
old_name='location',
new_name='facility',
),
migrations.AlterField(
model_name='notification',
name='facility',
field=models.ForeignKey(to='organizations.Facility'),
),
]
21 changes: 21 additions & 0 deletions notifications/migrations/0005_remove_notification_model.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

dependencies = [
('notifications', '0004_auto_20151003_2033'),
]

operations = [
migrations.RemoveField(
model_name='notification',
name='facility',
),
migrations.DeleteModel(
name='Notification',
),
]
Empty file.
3 changes: 2 additions & 1 deletion volunteer_planner/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
'non_logged_in_area',
'registration_history',
'scheduletemplates',
'news'
'news',
'notifications',
)

INSTALLED_APPS = DJANGO_APPS + LOCAL_APPS + THIRD_PARTY_APPS
Expand Down

0 comments on commit bee8d01

Please sign in to comment.