Honouring limit_choices_to

Was overriding any limit_choices_to options set on ForeignKey and ManyToManyField when forcing to only show draft items.
johnsensible · Aug 30, 2011 · a147db9 · a147db9
1 parent 81ddb1b
commit a147db9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/publish/__init__.py b/publish/__init__.py
@@ -1,2 +1,2 @@
-VERSION = (0, 3, 4)
+VERSION = (0, 3, 5)
 __version__ = '.'.join(map(str, VERSION))
diff --git a/publish/admin.py b/publish/admin.py
@@ -54,7 +54,8 @@ def _draft_queryset(db_field, kwargs):
     # see if we need to filter the field's queryset
     model = db_field.rel.to
     if issubclass(model, Publishable):
-        kwargs['queryset'] = model._default_manager.draft()
+        kwargs['queryset'] = model._default_manager.draft() \
+                              .complex_filter(db_field.rel.limit_choices_to)
 
 def attach_filtered_formfields(admin_class):
     # class decorator to add in extra methods that