allianceauth/eveonline/autogroups/models.py

@@ -39,13 +39,13 @@ class AutogroupsConfigManager(models.Manager):
         """
         if state is None:
             state = user.profile.state
+        for config in self.filter(states=state):
+            # grant user new groups for their state
+            config.update_group_membership_for_user(user)
         for config in self.exclude(states=state):
             # ensure user does not have groups from previous state
             config.remove_user_from_alliance_groups(user)
             config.remove_user_from_corp_groups(user)
-        for config in self.filter(states=state):
-            # grant user new groups for their state
-            config.update_group_membership_for_user(user)
 
 
 class AutogroupsConfig(models.Model):

allianceauth/eveonline/autogroups/tests/test_managers.py

@@ -1,4 +1,3 @@
-from allianceauth.eveonline.models import EveCorporationInfo
 from django.test import TestCase
 from allianceauth.tests.auth_utils import AuthUtils
 
@@ -74,51 +73,3 @@ class AutogroupsConfigManagerTestCase(TestCase):
         AutogroupsConfig.objects.update_groups_for_user(member)
 
         self.assertTrue(update_groups.called)
-
-    def test_update_group_membership_corp_in_two_configs(self):
-        # given
-        member = AuthUtils.create_member('test member')
-        AuthUtils.add_main_character_2(
-            member,
-            character_id='1234',
-            name='test character',
-            corp_id='2345',
-            corp_name='corp name',
-            corp_ticker='TIKK',
-
-        )
-
-        corp = EveCorporationInfo.objects.create(
-            corporation_id='2345',
-            corporation_name='corp name',
-            corporation_ticker='TIKK',
-            member_count=10,
-        )
-
-        member_state = AuthUtils.get_member_state()
-        member_config = AutogroupsConfig.objects.create(corp_groups=True)
-        member_config.states.add(member_state)
-        blue_state = AuthUtils.get_blue_state()
-        blue_state.member_corporations.add(corp)
-        blue_config = AutogroupsConfig.objects.create(corp_groups=True)
-        blue_config.states.add(blue_state)
-
-        member.profile.state = blue_state
-        member.profile.save()
-
-        AutogroupsConfig.objects.update_groups_for_user(member)
-
-        # Checks before test that the role is correctly applied
-        group = blue_config.get_corp_group(corp)
-        self.assertIn(group, member.groups.all())
-
-        # when
-        blue_state.member_corporations.remove(corp)
-        member_state.member_corporations.add(corp)
-        member.profile.state = member_state
-        member.profile.save()
-
-        # then
-        AutogroupsConfig.objects.update_groups_for_user(member)
-        group = member_config.get_corp_group(corp)
-        self.assertIn(group, member.groups.all())

allianceauth/menu/templates/menu/menu-notification-block.html

@@ -2,8 +2,8 @@
 {% load navactive %}
 {% load auth_notifications %}
 
-<li class="nav-item" id="menu_item_notifications">
-    <a class="nav-link {% navactive request 'notifications:' %}" href="{% url 'notifications:list' %}">
+<li class="nav-item {% navactive request 'notifications:' %}" id="menu_item_notifications">
+    <a class="nav-link" href="{% url 'notifications:list' %}">
         {% with unread_count=request.user|user_unread_notification_count %}
             <i class="fa-solid fa-bell{% if unread_count %} text-danger{% endif %}"></i>
         {% endwith %}

allianceauth/services/modules/discord/tests/test_managers.py

@@ -439,7 +439,6 @@ class TestUserHasAccount(NoSocketsTestCase):
 
     def test_return_false_if_user_does_not_exist(self):
         my_user = User(username='Dummy')
-        my_user.save()
         self.assertFalse(DiscordUser.objects.user_has_account(my_user))
 
     def test_return_false_if_not_called_with_user_object(self):

allianceauth/tests/auth_utils.py

@@ -78,13 +78,6 @@ class AuthUtils:
         except State.DoesNotExist:
             return cls.create_state('Member', 100, disconnect_signals=True)
 
-    @classmethod
-    def get_blue_state(cls):
-        try:
-            return State.objects.get(name='Blue')
-        except State.DoesNotExist:
-            return cls.create_state('Blue', 50, disconnect_signals=True)
-
     @classmethod
     def get_guest_state(cls):
         cls.disconnect_signals()