Ticket #10573: admin.diff

django/forms/forms.py

@@ -10 +10 @@
 from django.utils.safestring import mark_safe
 
 from fields import Field, FileField
-from widgets import Media, media_property, TextInput, Textarea
+from widgets import Media, media_property, TextInput, Textarea, MultiWidget
 from util import flatatt, ErrorDict, ErrorList, ValidationError
 
 __all__ = ('BaseForm', 'Form')
@@ -434 +434 @@
             return self.html_name
         return ''
     auto_id = property(_auto_id)
+
+    def _focus_id(self):
+        """
+        Returns the correct field to auto-focus on when rendering the form.
+        """
+        if isinstance(self.field.widget, MultiWidget):
+            return '%s_0' % self.auto_id
+        else:
+            return self.auto_id
+    focus_id = property(_focus_id)

django/contrib/admin/templates/admin/change_form.html

@@ -55 +55 @@
 {% submit_row %}
 
 {% if add %}
-   <script type="text/javascript">document.getElementById("{{ adminform.first_field.auto_id }}").focus();</script>
+   <script type="text/javascript">document.getElementById("{{ adminform.first_field.focus_id }}").focus();</script>
 {% endif %}
 
 {# JavaScript for prepopulated fields #}