diff --git a/wbc/comments/migrations/0002_auto_20170925_2026.py b/wbc/comments/migrations/0002_auto_20170925_2026.py new file mode 100644 index 0000000..9855671 --- /dev/null +++ b/wbc/comments/migrations/0002_auto_20170925_2026.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-09-25 18:26 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('comments', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='comment', + name='author_email', + field=models.CharField(max_length=256, verbose_name='Email'), + ), + migrations.AlterField( + model_name='comment', + name='author_name', + field=models.CharField(max_length=100, verbose_name='Autorin/Author'), + ), + migrations.AlterField( + model_name='comment', + name='author_url', + field=models.CharField(blank=True, max_length=256, verbose_name='Url'), + ), + migrations.AlterField( + model_name='comment', + name='content', + field=models.TextField(verbose_name='Inhalt'), + ), + migrations.AlterField( + model_name='comment', + name='enabled', + field=models.BooleanField(verbose_name='Freigeschaltet'), + ), + migrations.AlterField( + model_name='comment', + name='place', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='process.Place', verbose_name='Ort'), + ), + ] diff --git a/wbc/core/templatetags/wbc_extras.py b/wbc/core/templatetags/wbc_extras.py index b34ffb5..2406521 100644 --- a/wbc/core/templatetags/wbc_extras.py +++ b/wbc/core/templatetags/wbc_extras.py @@ -3,7 +3,7 @@ from django import template from django.template.defaultfilters import stringfilter -from django.utils.encoding import force_unicode +from django.utils.encoding import force_text from django.utils.safestring import mark_safe register = template.Library() @@ -11,5 +11,5 @@ @register.filter(is_safe=True) @stringfilter def markdown(value): - value = force_unicode(value) + value = force_text(value) return mdn(value) diff --git a/wbc/news/migrations/0002_auto_20170925_2026.py b/wbc/news/migrations/0002_auto_20170925_2026.py new file mode 100644 index 0000000..f5edc6a --- /dev/null +++ b/wbc/news/migrations/0002_auto_20170925_2026.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-09-25 18:26 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('news', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='newsletter', + name='n', + field=models.IntegerField(verbose_name='Anzahl Mails'), + ), + migrations.AlterField( + model_name='newsletter', + name='send', + field=models.DateTimeField(verbose_name='Gesendet'), + ), + ] diff --git a/wbc/news/views.py b/wbc/news/views.py index 845dcf5..805d643 100644 --- a/wbc/news/views.py +++ b/wbc/news/views.py @@ -16,8 +16,8 @@ def subscribe(request): entities = District.objects.all().values() unsubscribe_path = reverse( - 'wbc.news.views.unsubscribe', args=['.']).strip('.') - validate_path = reverse('wbc.news.views.validate', args=['.']).strip('.') + unsubscribe, args=['.']).strip('.') + validate_path = reverse(validate, args=['.']).strip('.') if request.method == 'POST': form = SubscribeForm(request.POST, entities=entities) diff --git a/wbc/process/migrations/0002_auto_20170925_2026.py b/wbc/process/migrations/0002_auto_20170925_2026.py new file mode 100644 index 0000000..4ce584dc --- /dev/null +++ b/wbc/process/migrations/0002_auto_20170925_2026.py @@ -0,0 +1,126 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-09-25 18:26 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('process', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='place', + name='address', + field=models.CharField(blank=True, help_text='Eine genaue Adresse des Vorhabens', max_length=256, verbose_name='Adresse'), + ), + migrations.AlterField( + model_name='place', + name='description', + field=models.TextField(blank=True, help_text='Örtliche Beschreibung', verbose_name='Beschreibung'), + ), + migrations.AlterField( + model_name='place', + name='entities', + field=models.ManyToManyField(blank=True, related_name='places', to='region.Entity', verbose_name='Einheit'), + ), + migrations.AlterField( + model_name='place', + name='identifier', + field=models.CharField(blank=True, help_text='ggf. Bezeichner des Beplauungsplans', max_length=64, verbose_name='Bezeichner'), + ), + migrations.AlterField( + model_name='place', + name='lat', + field=models.FloatField(verbose_name='Breitengrad'), + ), + migrations.AlterField( + model_name='place', + name='lon', + field=models.FloatField(verbose_name='Längengrad'), + ), + migrations.AlterField( + model_name='processstep', + name='description', + field=models.TextField(verbose_name='Beschreibung'), + ), + migrations.AlterField( + model_name='processstep', + name='hover_icon', + field=models.CharField(max_length=256, verbose_name='Icon auf der Karte bei Hovereffekt'), + ), + migrations.AlterField( + model_name='processstep', + name='icon', + field=models.CharField(max_length=256, verbose_name='Icon auf der Karte'), + ), + migrations.AlterField( + model_name='processstep', + name='name', + field=models.CharField(max_length=256, verbose_name='Name'), + ), + migrations.AlterField( + model_name='processstep', + name='order', + field=models.IntegerField(help_text='Nummer in der Reihenfolge', verbose_name='Reihenfolge'), + ), + migrations.AlterField( + model_name='processstep', + name='process_type', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='process_steps', to='process.ProcessType', verbose_name='Verfahren'), + ), + migrations.AlterField( + model_name='processtype', + name='description', + field=models.TextField(verbose_name='Beschreibung'), + ), + migrations.AlterField( + model_name='processtype', + name='name', + field=models.CharField(max_length=256, verbose_name='Name'), + ), + migrations.AlterField( + model_name='publication', + name='begin', + field=models.DateField(verbose_name='Beginn der Auslegungszeit'), + ), + migrations.AlterField( + model_name='publication', + name='department', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='region.Department', verbose_name='Verantwortliche Behörde'), + ), + migrations.AlterField( + model_name='publication', + name='description', + field=models.TextField(blank=True, verbose_name='Beschreibung'), + ), + migrations.AlterField( + model_name='publication', + name='end', + field=models.DateField(verbose_name='Ende der Auslegungszeit'), + ), + migrations.AlterField( + model_name='publication', + name='office', + field=models.TextField(blank=True, verbose_name='Auslegungsstelle'), + ), + migrations.AlterField( + model_name='publication', + name='office_hours', + field=models.TextField(blank=True, verbose_name='Öffnungszeiten der Auslegungsstelle'), + ), + migrations.AlterField( + model_name='publication', + name='place', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='publications', to='process.Place', verbose_name='Ort'), + ), + migrations.AlterField( + model_name='publication', + name='process_step', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='publications', to='process.ProcessStep', verbose_name='Verfahrensschritt'), + ), + ] diff --git a/wbc/process/urls.py b/wbc/process/urls.py index 87c1081..91486fb 100755 --- a/wbc/process/urls.py +++ b/wbc/process/urls.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from rest_framework import routers from .views import * @@ -13,6 +13,6 @@ router.register(r'processsteps', ProcessStepViewSet, base_name='processstep') router.register(r'processtypes', ProcessTypeViewSet, base_name='processtype') -urlpatterns = patterns('', +urlpatterns = [ url(r'^', include(router.urls)), -) +] diff --git a/wbc/region/migrations/0002_auto_20170925_2026.py b/wbc/region/migrations/0002_auto_20170925_2026.py new file mode 100644 index 0000000..df1124f --- /dev/null +++ b/wbc/region/migrations/0002_auto_20170925_2026.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-09-25 18:26 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('region', '0001_initial'), + ] + + operations = [ + migrations.RenameField( + model_name='district', + old_name='muncipality', + new_name='belongs_to', + ), + migrations.RenameField( + model_name='quarter', + old_name='district', + new_name='belongs_to', + ), + ] diff --git a/wbc/region/models.py b/wbc/region/models.py index 0f73d3a..b1e4cd3 100755 --- a/wbc/region/models.py +++ b/wbc/region/models.py @@ -27,7 +27,7 @@ class Meta: class District(Entity): - muncipality = models.ForeignKey(Muncipality, related_name='districts') + belongs_to = models.ForeignKey(Muncipality, related_name='districts') class Meta: verbose_name = 'Bezirk' @@ -35,7 +35,7 @@ class Meta: class Quarter(Entity): - district = models.ForeignKey(District, related_name='quarters') + belongs_to = models.ForeignKey(District, related_name='quarters') class Meta: verbose_name = 'Ortsteil' diff --git a/wbc/region/urls.py b/wbc/region/urls.py index 99df29c..637a85f 100755 --- a/wbc/region/urls.py +++ b/wbc/region/urls.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.conf.urls import patterns, include, url +from django.conf.urls import include, url from rest_framework import routers from .views import * @@ -9,6 +9,6 @@ router.register(r'quarters', QuarterViewSet, base_name='quarter') router.register(r'departments', DepartmentViewSet, base_name='department') -urlpatterns = patterns('', - url(r'^', include(router.urls)), -) +urlpatterns = [ + url(r'', include(router.urls)), +]