Merge branch 'autogroup-multiple-configs' into 'master'

[Fix] Multiple AutoGroupsConfig will override each others See merge request allianceauth/allianceauth!1722
Merge branch 'fix-instance-must-be-saved' into 'master'
2025-07-20 17:52:30 +02:00 · 2025-05-24 04:05:07 +00:00 · 2025-05-24 04:04:27 +00:00 · 2025-05-24 04:00:59 +00:00 · 2025-05-22 09:21:05 +02:00 · 2025-05-21 21:52:40 +02:00
2 changed files with 3 additions and 2 deletions
--- a/allianceauth/menu/templates/menu/menu-notification-block.html
+++ b/allianceauth/menu/templates/menu/menu-notification-block.html
@ -2,8 +2,8 @@
 {% load navactive %}
 {% load auth_notifications %}
-<li class="nav-item {% navactive request 'notifications:' %}" id="menu_item_notifications">
+<li class="nav-item" id="menu_item_notifications">
-    <a class="nav-link" href="{% url 'notifications:list' %}">
+    <a class="nav-link {% navactive request 'notifications:' %}" 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 %}
--- a/allianceauth/services/modules/discord/tests/test_managers.py
+++ b/allianceauth/services/modules/discord/tests/test_managers.py
@ -439,6 +439,7 @@ 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):
Author	SHA1	Message	Date
T'rahk Rokym	713ef5a971	Merge branch 'autogroup-multiple-configs' into 'master' [Fix] Multiple AutoGroupsConfig will override each others See merge request allianceauth/allianceauth!1722	2025-05-24 04:05:07 +00:00
Ariel Rin	bf32f2c1ef	Merge branch 'fix-instance-must-be-saved' into 'master' Fix discord test errror See merge request allianceauth/allianceauth!1723	2025-05-24 04:04:27 +00:00
Ariel Rin	7ca67ebaae	Merge branch 'fix-active-class' into 'master' [FIX] Active class on notification icon See merge request allianceauth/allianceauth!1724	2025-05-24 04:00:59 +00:00
Peter Pfeufer	fa32f87a35	[FIX] Active class on notification icon	2025-05-22 09:21:05 +02:00
T'rahk Rokym	a630015451	Fix error on one of my tox settings ValueError: Model instances passed to related filters must be saved.	2025-05-21 21:52:40 +02:00