Define roles in migration instead of fixture

digitalfabrik · Jan 16, 2022 · 442a078 · 442a078
1 parent 34716bf
commit 442a078
Show file tree

Hide file tree

Showing 7 changed files with 303 additions and 314 deletions.
diff --git a/dev-tools/_functions.sh b/dev-tools/_functions.sh
@@ -219,8 +219,6 @@ function migrate_database {
         deescalate_privileges pipenv run integreat-cms-cli makemigrations --verbosity "${SCRIPT_VERBOSITY}"
         # Execute migrations
         deescalate_privileges pipenv run integreat-cms-cli migrate --verbosity "${SCRIPT_VERBOSITY}"
-        # Load the role fixtures
-        deescalate_privileges pipenv run integreat-cms-cli loaddata "${PACKAGE_DIR}/cms/fixtures/roles.json" --verbosity "${SCRIPT_VERBOSITY}"
         echo "✔ Finished database migrations" | print_success
         DATABASE_MIGRATED=1
     fi

diff --git a/integreat_cms/api/tests/api_tests.py b/integreat_cms/api/tests/api_tests.py
@@ -54,7 +54,6 @@ class ApiTest(TestCase):
     """
 
     fixtures = [
-        "integreat_cms/cms/fixtures/roles.json",
         "integreat_cms/cms/fixtures/test_data.json",
     ]
 

diff --git a/integreat_cms/cms/admin.py b/integreat_cms/cms/admin.py
@@ -32,5 +32,12 @@ class ModelTreeAdmin(TreeAdmin):
             admin.site.register(model, ModelTreeAdmin)
         else:
             admin.site.register(model)
+    admin.site.register(apps.get_model("auth", "Permission"))
+    for model in apps.get_app_config("admin").get_models():
+        admin.site.register(model)
     for model in apps.get_app_config("linkcheck").get_models():
         admin.site.register(model)
+    for model in apps.get_app_config("contenttypes").get_models():
+        admin.site.register(model)
+    for model in apps.get_app_config("sessions").get_models():
+        admin.site.register(model)
diff --git a/integreat_cms/cms/fixtures/roles.json b/integreat_cms/cms/fixtures/roles.json