Merge pull request #134 from mnitchie/master

Frodothedwarf · web-flow · commit 14322d1278b9 · 2025-11-13T07:45:35.000+01:00
fix: Explicit kwargs should take precedence over resolver_kwargs
diff --git a/active_link/templatetags/active_link_tags.py b/active_link/templatetags/active_link_tags.py
@@ -43,7 +43,9 @@ def active_link(
     if hasattr(request, "resolver_match") and hasattr(request.resolver_match, "kwargs"):
         resolver_kwargs = request.resolver_match.kwargs
 
-    kwargs.update(resolver_kwargs)
+    # Use resolver_kwargs as defaults, but explicitly provided kwargs (like pk)
+    # take precedence
+    kwargs = {**resolver_kwargs, **kwargs}
 
     active = False
     views = viewnames.split("||")
diff --git a/tests/templates/detailed_action_kwargs_multiple_specific.html b/tests/templates/detailed_action_kwargs_multiple_specific.html
@@ -0,0 +1,15 @@
+{% load active_link_tags %}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Multiple specific links test</title>
+</head>
+<body>
+    <div id="link-pk-1" class="{% active_link 'detailed-action-multiple-specific' pk=1 %}">Link to pk=1</div>
+    <div id="link-pk-2" class="{% active_link 'detailed-action-multiple-specific' pk=2 %}">Link to pk=2</div>
+    <div id="link-pk-3" class="{% active_link 'detailed-action-multiple-specific' pk=3 %}">Link to pk=3</div>
+</body>
+</html>
+
diff --git a/tests/test_tags.py b/tests/test_tags.py
@@ -101,3 +101,22 @@ def test_404_page_with_missing_resolver_match(self):
         # Should render the inactive class without throwing an error
         self.assertIn('class="not-active"', html)
         self.assertNotIn('class="active"', html)
+
+    def test_multiple_links_with_specific_kwargs(self):
+        """
+        Test that multiple active_link tags on the same page with different
+        explicit kwargs are evaluated independently.
+
+        When viewing a page with the URL /detailed/action/multiple-specific/2/,
+        and the page has `active_link` tags for pk=1, pk=2, and pk=3. Only the
+        link with pk=2 should be active. The resolver_kwargs from the current
+        URL should serve as defaults but not override the explicit pk values.
+        """
+        content = self.reverse_helper("detailed-action-multiple-specific", {"pk": 2})
+
+        # Only the link with pk=2 should be active
+        self.assertIn('id="link-pk-2" class="active"', content)
+
+        # Links with pk=1 and pk=3 should NOT be active
+        self.assertNotIn('id="link-pk-1" class="active"', content)
+        self.assertNotIn('id="link-pk-3" class="active"', content)
diff --git a/tests/urls.py b/tests/urls.py
@@ -41,4 +41,11 @@
         TemplateView.as_view(template_name="detailed_action_kwargs_multiple.html"),
         name="detailed-action-multiple",
     ),
+    path(
+        r"detailed/action/multiple-specific/<int:pk>/",
+        TemplateView.as_view(
+            template_name="detailed_action_kwargs_multiple_specific.html"
+        ),
+        name="detailed-action-multiple-specific",
+    ),
 ]
