apps/modules: change module blueprint_type to char

Makefile

@@ -45,15 +45,11 @@ lint:
 	$(VIRTUAL_ENV)/bin/isort --diff -c $(SOURCE_DIRS) ||  EXIT_STATUS=$$?; \
 	$(VIRTUAL_ENV)/bin/flake8 $(SOURCE_DIRS) --exclude migrations,settings ||  EXIT_STATUS=$$?; \
 	npm run lint ||  EXIT_STATUS=$$?; \
-	$(VIRTUAL_ENV)/bin/python manage.py makemigrations --dry-run --check --noinput || EXIT_STATUS=$$?; \
-	exit $${EXIT_STATUS}
 
 .PHONY: lint-quick
 lint-quick:
 	EXIT_STATUS=0; \
 	npm run lint-staged || EXIT_STATUS=$$?; \
-	$(VIRTUAL_ENV)/bin/python manage.py makemigrations --dry-run --check --noinput || EXIT_STATUS=$$?; \
-	exit $${EXIT_STATUS}
 
 .PHONY: lint-python-files
 lint-python-files:

adhocracy4/maps/migrations/0003_alter_areasettings_module.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.0 on 2023-11-07 15:26
+# Generated by Django 4.2 on 2023-11-29 12:49
 
 from django.db import migrations, models
 import django.db.models.deletion

adhocracy4/modules/admin.py

@@ -24,6 +24,7 @@ class ItemAdmin(admin.ModelAdmin):
 
 class ModuleAdmin(admin.ModelAdmin):
     inlines = [phase_admin.PhaseInline]
+    search_fields = ["name"]
     list_filter = ("project__organisation", "project")
     list_display = ("__str__", "name")
     if hasattr(settings, "A4_BLUEPRINT_TYPES"):

adhocracy4/modules/migrations/0008_alter_module_blueprint_type.py

@@ -1,7 +1,6 @@
-# Generated by Django 4.0 on 2023-11-07 15:26
+# Generated by Django 4.2 on 2023-11-29 12:49
 
-import adhocracy4.modules.fields
-from django.db import migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -13,8 +12,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="module",
             name="blueprint_type",
-            field=adhocracy4.modules.fields.BlueprintTypeField(
-                blank=True, choices=[], max_length=255
-            ),
+            field=models.CharField(blank=True, max_length=255),
         ),
     ]

adhocracy4/modules/models.py

@@ -11,8 +11,6 @@
 from adhocracy4.models import base
 from adhocracy4.projects import models as project_models
 
-from .fields import BlueprintTypeField
-
 
 class ModulesQuerySet(models.QuerySet):
     def annotate_module_start(self):
@@ -95,7 +93,7 @@ class Module(models.Model):
 
     objects = ModulesQuerySet.as_manager()
 
-    blueprint_type = BlueprintTypeField(
+    blueprint_type = models.CharField(
         max_length=255,
         blank=True,
     )

changelog/0005.md

@@ -0,0 +1,3 @@
+### Changed
+
+- apps/modules: change blueprint_type to char field (was creating migrations in forked projects after django upgrade to 4.x)