Ticket #3737: auto_populate_fields_from_filters.patch

contrib/admin/templates/admin/change_list.html

@@ -9 +9 @@
 <div id="content-main">
 {% block object-tools %}
 {% if has_add_permission %}
-<ul class="object-tools"><li><a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name|escape as name %}Add {{ name }}{% endblocktrans %}</a></li></ul>
+<ul class="object-tools"><li><a href="add/{{cl.get_add_query_string}}{% if is_popup %}&_popup=1{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name|escape as name %}Add {{ name }}{% endblocktrans %}</a></li></ul>
 {% endif %}
 {% endblock %}
 <div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">

contrib/admin/views/main.py

@@ -599 +599 @@
             elif v is not None:
                 p[k] = v
         return '?' + '&'.join(['%s=%s' % (k, v) for k, v in p.items()]).replace(' ', '%20')
-
+    
+    def get_add_query_string(self):
+        from django.db.models import query
+  
+        p = self.params.copy()
+       
+        new_query_dict = {}
+        for k in p.keys():
+            path = k.split(query.LOOKUP_SEPARATOR)
+            lookup_type = path.pop()
+            if len(path) == 0 or lookup_type not in query.QUERY_TERMS:
+                path.append(lookup_type)
+            new_query_dict["_".join(path)] = p[k]
+        return '?' + '&'.join(['%s=%s' % (k, v) for k, v in new_query_dict.items()]).replace(' ', '%20')
+    
     def get_results(self, request):
         paginator = ObjectPaginator(self.query_set, self.lookup_opts.admin.list_per_page)