Anonymous avatar Anonymous committed 628a81c

The autocomplete_view now takes into account limit_choices_to.

Comments (0)

Files changed (1)

django/contrib/admin/options.py

         if field not in self.autocomplete_fields or query is None:
             raise Http404
         
-        rel_model = getattr(self.model, field).field.rel.to
-        # XXX are we considering limit_choices_to ?
-        queryset = rel_model._default_manager.all()
+        relation = getattr(self.model, field).field.rel
+        queryset = relation.to._default_manager.complex_filter(relation.limit_choices_to)
         settings = self.autocomplete_fields[field]
-        
+
         def construct_search(field_name):
             # use different lookup methods depending on the notation
             if field_name.startswith('^'):
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.