Merge branch 'faction' into 'v2.9.x'

Allow assigning factions to states. See merge request allianceauth/allianceauth!1338
2026-02-09 08:36:23 +01:00 · 2021-10-26 09:16:29 +00:00
parent 5d4277adf0 23849b9f42
commit 527c016c72
19 changed files with 629 additions and 67 deletions
--- a/allianceauth/services/modules/discord/tests/test_admin.py
+++ b/allianceauth/services/modules/discord/tests/test_admin.py
@@ -207,7 +207,7 @@ class TestColumnRendering(TestDataMixin, TestCase):
        self.assertEqual(result, expected)

    def test_user_main_organization_u3(self):
-        expected = None
+        expected = ''
        result = user_main_organization(self.user_3.discord)
        self.assertEqual(result, expected)