Have the template tag query_string support multiple arguments and arguments of type Mapping[str, Any]

[Sarah Boyce]

Based off this discussion: ​https://forum.djangoproject.com/t/adding-a-template-tag-to-generate-query-strings/24521/28

Currently query_string only supports a single QueryDict as an argument, consensus appears to want the following updates:

• support arguments of type Mapping[str, Any]
• support multiple arguments

Tests which hopefully illustrate the requested updates

tests/template_tests/syntax_tests/test_query_string.py

@@ -93 +93 @@
         )
         self.assertEqual(output, "?a=2&b=2")
 
+    @setup({"query_string_dict": "{% query_string my_dict %}"})
+    def test_query_string_with_explicit_dict_and_no_request(self):
+        context = {"my_dict": {"a": 1, "b": 2}}
+        output = self.engine.render_to_string("query_string_dict", context)
+        self.assertEqual(output, "?a=1&b=2")
+
+    @setup({"query_string_multiple_args": "{% query_string my_dict my_query_dict %}"})
+    def test_query_string_with_multiple_args(self):
+        context = {"my_dict": {"a": 1, "b": 2}, "my_query_dict": QueryDict("c=1")}
+        output = self.engine.render_to_string("query_string_multiple_args", context)
+        self.assertEqual(output, "?a=1&b=2&c=1")
+
     @setup({"query_string_no_request_no_query_dict": "{% query_string %}"})
     def test_query_string_without_request_or_explicit_query_dict(self):

[Carsten Fuchs]

Isn't this how it is already implemented?

My understanding of the discussion was that ​more than one dict could be supported.

[Sarah Boyce]

Replying to Carsten Fuchs:

Isn't this how it is already implemented?

No I don't think so. It must be a QueryDict. The attached test currently fails with

  ...
  File "pathtodjango\django\template\defaulttags.py", line 1208, in query_string
    query_string = query_dict.urlencode()
                   ^^^^^^^^^^^^^^^^^^^^
AttributeError: 'dict' object has no attribute 'urlencode'

[Carsten Fuchs]

No I don't think so. It must be a QueryDict.

Oh, right. I'm sorry.
These are two separate issues then: Supporting Mapping[str, Any] and supporting more than one of them.

[Sarah Boyce]

Replying to Carsten Fuchs:

Oh, right. I'm sorry.
These are two separate issues then: Supporting Mapping[str, Any] and supporting more than one of them.

Don't say sorry, they are very related as issues and go well together, thank you for pointing it out. Updated the ticket to capture both of these 👍

[Natalia Bidart]

Accepting following the forum conversation.

[Giannis Terzopoulos]

​PR

[Natalia Bidart]

PR looks good but I found a few cases where it could be considered that we are breaking previous behavior. I have proposed ​PR 18487 to add extra tests for the existing tag as is. Leaving "patch needs improvement" set.

[Natalia Bidart]

I took another look since I had a reminder for this work, and the branch now has conflicts with main and there are some comments from Tom to address. Leaving flags as they are.

[Natalia Bidart]

We need to solve #36268 before landing this PR.