From 9f402f476a4cfeb7c59d65b7c72bfa5bbd2b21e8 Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Fri, 3 Feb 2023 15:17:44 +0100 Subject: [PATCH] Add georegion to government model --- ..._alter_government_jurisdiction_and_more.py | 96 +++++++++++++++++++ froide_govplan/models.py | 9 ++ 2 files changed, 105 insertions(+) create mode 100644 froide_govplan/migrations/0012_government_georegion_alter_government_jurisdiction_and_more.py diff --git a/froide_govplan/migrations/0012_government_georegion_alter_government_jurisdiction_and_more.py b/froide_govplan/migrations/0012_government_georegion_alter_government_jurisdiction_and_more.py new file mode 100644 index 0000000..b925a07 --- /dev/null +++ b/froide_govplan/migrations/0012_government_georegion_alter_government_jurisdiction_and_more.py @@ -0,0 +1,96 @@ +# Generated by Django 4.1.4 on 2023-02-03 10:00 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("cms", "0022_auto_20180620_1551"), + ("publicbody", "0043_merge_20221019_1020"), + ("georegion", "0011_georegion_invalid_on"), + ("froide_govplan", "0011_governmentplan_properties"), + ] + + operations = [ + migrations.AddField( + model_name="government", + name="georegion", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + to="georegion.georegion", + verbose_name="georegion", + ), + ), + migrations.AlterField( + model_name="government", + name="jurisdiction", + field=models.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.SET_NULL, + to="publicbody.jurisdiction", + verbose_name="jurisdiction", + ), + ), + migrations.AlterField( + model_name="governmentplanscmsplugin", + name="cmsplugin_ptr", + field=models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + related_name="%(app_label)s_%(class)s", + serialize=False, + to="cms.cmsplugin", + ), + ), + migrations.AlterField( + model_name="governmentplanscmsplugin", + name="template", + field=models.CharField( + blank=True, + choices=[ + ("froide_govplan/plugins/default.html", "Normal"), + ("froide_govplan/plugins/progress.html", "Progress"), + ("froide_govplan/plugins/progress_row.html", "Progress Row"), + ("froide_govplan/plugins/time_used.html", "Time used"), + ("froide_govplan/plugins/card_cols.html", "Card columns"), + ("froide_govplan/plugins/search.html", "Search"), + ], + help_text="template used to display the plugin", + max_length=250, + verbose_name="template", + ), + ), + migrations.AlterField( + model_name="governmentplansectionscmsplugin", + name="cmsplugin_ptr", + field=models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + related_name="%(app_label)s_%(class)s", + serialize=False, + to="cms.cmsplugin", + ), + ), + migrations.AlterField( + model_name="governmentplanupdatescmsplugin", + name="cmsplugin_ptr", + field=models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + related_name="%(app_label)s_%(class)s", + serialize=False, + to="cms.cmsplugin", + ), + ), + ] diff --git a/froide_govplan/models.py b/froide_govplan/models.py index 29b0611..c8ffe5b 100644 --- a/froide_govplan/models.py +++ b/froide_govplan/models.py @@ -17,6 +17,7 @@ from taggit.models import TaggedItemBase from froide.foirequest.models import FoiRequest from froide.follow.models import Follower +from froide.georegion.models import GeoRegion from froide.organization.models import Organization from froide.publicbody.models import Category, Jurisdiction, PublicBody @@ -62,10 +63,18 @@ class Government(models.Model): public = models.BooleanField(default=False, verbose_name=_("is public?")) jurisdiction = models.ForeignKey( Jurisdiction, + blank=True, null=True, on_delete=models.SET_NULL, verbose_name=_("jurisdiction"), ) + georegion = models.ForeignKey( + GeoRegion, + blank=True, + null=True, + on_delete=models.SET_NULL, + verbose_name=_("georegion"), + ) description = models.TextField(blank=True, verbose_name=_("description")) start_date = models.DateField(null=True, blank=True, verbose_name=_("start date"))