Ticket #17881: 17881-poc.patch

django/contrib/admin/options.py

@@ -112 +112 @@
             # extra HTML -- the "add other" interface -- to the end of the
             # rendered output. formfield can be None if it came from a
             # OneToOneField with parent_link=True or a M2M intermediary.
-            if formfield and db_field.name not in self.raw_id_fields:
+            if formfield and db_field.name not in self.get_raw_id_fields(request):
                 related_modeladmin = self.admin_site._registry.get(
                                                             db_field.rel.to)
                 can_add_related = bool(related_modeladmin and
@@ -156 +156 @@
         Get a form Field for a ForeignKey.
         """
         db = kwargs.get('using')
-        if db_field.name in self.raw_id_fields:
+        if db_field.name in self.get_raw_id_fields(request):
             kwargs['widget'] = widgets.ForeignKeyRawIdWidget(db_field.rel,
                                     self.admin_site, using=db)
         elif db_field.name in self.radio_fields:
@@ -177 +177 @@
             return None
         db = kwargs.get('using')
 
-        if db_field.name in self.raw_id_fields:
+        if db_field.name in self.get_raw_id_fields(request):
             kwargs['widget'] = widgets.ManyToManyRawIdWidget(db_field.rel,
                                     self.admin_site, using=db)
             kwargs['help_text'] = ''
@@ -200 +200 @@
         """
         return self.ordering or ()  # otherwise we might try to *None, which is bad ;)
 
+    def get_raw_id_fields(self, request):
+        """
+        Hook for specifying custom raw id fields.
+        """
+        return self.raw_id_fields
+
     def get_readonly_fields(self, request, obj=None):
         """
         Hook for specifying custom readonly fields.