mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Moved first_form_field_id calculation from render_change_form() to AdminForm()

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-01-21 00:20:18 +00:00
parent 4e98d69be6
commit 1fc252e087
6 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/options.py
View File

@ -76,6 +76,10 @@ class AdminForm(object):
for fieldset in self.fieldsets: for fieldset in self.fieldsets:
yield BoundFieldset(self.form, fieldset) yield BoundFieldset(self.form, fieldset)
def first_field(self):
for bf in self.form:
return bf
class Fieldset(object): class Fieldset(object):
def __init__(self, name=None, fields=(), classes=(), description=None): def __init__(self, name=None, fields=(), classes=(), description=None):
self.name, self.fields = name, fields self.name, self.fields = name, fields

2
django/contrib/admin/templates/admin/auth/user/add_form.html
View File

@ -24,5 +24,7 @@
<p class="help">{% trans 'Enter the same password as above, for verification.' %}</p> <p class="help">{% trans 'Enter the same password as above, for verification.' %}</p>
</div> </div>
<script type="text/javascript">document.getElementById("id_username").focus();</script>
</fieldset> </fieldset>
{% endblock %} {% endblock %}

2
django/contrib/admin/templates/admin/auth/user/change_password.html
View File

@ -46,7 +46,7 @@
<input type="submit" value="{% trans 'Change password' %}" class="default" /> <input type="submit" value="{% trans 'Change password' %}" class="default" />
</div> </div>
<script type="text/javascript">document.getElementById("{{ first_form_field_id }}").focus();</script> <script type="text/javascript">document.getElementById("id_password1").focus();</script>
</div> </div>
</form></div> </form></div>
{% endblock %} {% endblock %}

2
django/contrib/admin/templates/admin/change_form.html
View File

@ -79,7 +79,7 @@
{% submit_row %} {% submit_row %}
{% if add %} {% if add %}
<script type="text/javascript">document.getElementById("{{ first_form_field_id }}").focus();</script> <script type="text/javascript">document.getElementById("{{ adminform.first_field.auto_id }}").focus();</script>
{% endif %} {% endif %}
{% if auto_populated_fields %} {% if auto_populated_fields %}

2
django/contrib/admin/views/auth.py
View File

@ -38,7 +38,6 @@ def user_add_stage(request):
'has_absolute_url': False, 'has_absolute_url': False,
'auto_populated_fields': (), 'auto_populated_fields': (),
'bound_field_sets': (), 'bound_field_sets': (),
'first_form_field_id': 'id_username',
'opts': User._meta, 'opts': User._meta,
'username_help_text': User._meta.get_field('username').help_text, 'username_help_text': User._meta.get_field('username').help_text,
}, context_instance=template.RequestContext(request)) }, context_instance=template.RequestContext(request))
@ -69,7 +68,6 @@ def user_change_password(request, id):
'has_delete_permission': False, 'has_delete_permission': False,
'has_change_permission': True, 'has_change_permission': True,
'has_absolute_url': False, 'has_absolute_url': False,
'first_form_field_id': 'id_password1',
'opts': User._meta, 'opts': User._meta,
'original': user, 'original': user,
'show_save': True, 'show_save': True,

2
django/contrib/admin/views/main.py
View File

@ -173,7 +173,6 @@ def render_change_form(model_admin, model, manipulator, context, add=False, chan
field_sets = model_admin.get_field_sets() field_sets = model_admin.get_field_sets()
original = getattr(manipulator, 'original_object', None) original = getattr(manipulator, 'original_object', None)
bound_field_sets = [field_set.bind(context['oldform'], original, AdminBoundFieldSet) for field_set in field_sets] bound_field_sets = [field_set.bind(context['oldform'], original, AdminBoundFieldSet) for field_set in field_sets]
first_form_field_id = bound_field_sets[0].bound_field_lines[0].bound_fields[0].form_fields[0].get_id();
ordered_objects = opts.get_ordered_objects() ordered_objects = opts.get_ordered_objects()
inline_related_objects = opts.get_followed_related_objects(manipulator.follow) inline_related_objects = opts.get_followed_related_objects(manipulator.follow)
extra_context = { extra_context = {
@ -185,7 +184,6 @@ def render_change_form(model_admin, model, manipulator, context, add=False, chan
'has_absolute_url': hasattr(model, 'get_absolute_url'), 'has_absolute_url': hasattr(model, 'get_absolute_url'),
'auto_populated_fields': auto_populated_fields, 'auto_populated_fields': auto_populated_fields,
'bound_field_sets': bound_field_sets, 'bound_field_sets': bound_field_sets,
'first_form_field_id': first_form_field_id,
'javascript_imports': get_javascript_imports(opts, auto_populated_fields, field_sets), 'javascript_imports': get_javascript_imports(opts, auto_populated_fields, field_sets),
'ordered_objects': ordered_objects, 'ordered_objects': ordered_objects,
'inline_related_objects': inline_related_objects, 'inline_related_objects': inline_related_objects,