Fixed FK popup for nested sets.

idlesign · Sep 8, 2018 · 0b09017 · 0b09017
1 parent bfc04dc
commit 0b09017
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,11 @@ django-admirarchy changelog
 ===========================
 
 
+Unreleased
+----------
+* Fixed FK popup for nested sets.
+
+
 v0.2.2
 ------
 * Dummy. No changes.

diff --git a/admirarchy/tests/test_basic.py b/admirarchy/tests/test_basic.py
@@ -48,6 +48,12 @@ def actual_test(model_id, user_create, request_client):
     assert model_id + '_child1' in resp.rendered_content
     assert model_id + '_child2' in resp.rendered_content
 
+    # Foreign key popup.
+    resp = client.get(url_base + '?_to_field=id&_popup=1')
+
+    assert '?pid=1&amp;_to_field=id&amp;_popup=1' in resp.rendered_content
+    assert model_id + '_parent' in resp.rendered_content
+
 
 def test_adjacency_list(request_client, user_create):
 

diff --git a/admirarchy/utils.py b/admirarchy/utils.py
@@ -294,7 +294,7 @@ def hook_get_queryset(self, changelist, request):
 
         else:
             changelist.params[self.level_field] = self.root_level
-            self.parent = qs.get(**changelist.params)
+            self.parent = qs.get(**{key: val for key, val in changelist.params.items() if not key.startswith('_')})
 
     def hook_get_results(self, changelist):
         """Triggered by `ChangeList.get_results()`."""