Django

Code

Changeset 4375

Show
Ignore:
Timestamp:
01/20/07 18:20:18 (2 years ago)
Author:
adrian
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin/django/contrib/admin/options.py

    r4372 r4375  
    7676        for fieldset in self.fieldsets: 
    7777            yield BoundFieldset(self.form, fieldset) 
     78 
     79    def first_field(self): 
     80        for bf in self.form: 
     81            return bf 
    7882 
    7983class Fieldset(object): 

  • django/branches/newforms-admin/django/contrib/admin/templates/admin/auth/user/add_form.html

    r3520 r4375  
    2525</div> 
    2626 
     27<script type="text/javascript">document.getElementById("id_username").focus();</script> 
     28 
    2729</fieldset> 
    2830{% endblock %} 

  • django/branches/newforms-admin/django/contrib/admin/templates/admin/auth/user/change_password.html

    r4302 r4375  
    4747</div> 
    4848 
    49 <script type="text/javascript">document.getElementById("{{ first_form_field_id }}").focus();</script> 
     49<script type="text/javascript">document.getElementById("id_password1").focus();</script> 
    5050</div> 
    5151</form></div> 

  • django/branches/newforms-admin/django/contrib/admin/templates/admin/change_form.html

    r4372 r4375  
    8080 
    8181{% if add %} 
    82    <script type="text/javascript">document.getElementById("{{ first_form_field_id }}").focus();</script> 
     82   <script type="text/javascript">document.getElementById("{{ adminform.first_field.auto_id }}").focus();</script> 
    8383{% endif %} 
    8484 

  • django/branches/newforms-admin/django/contrib/admin/views/auth.py

    r4266 r4375  
    3939        'auto_populated_fields': (), 
    4040        'bound_field_sets': (), 
    41         'first_form_field_id': 'id_username', 
    4241        'opts': User._meta, 
    4342        'username_help_text': User._meta.get_field('username').help_text, 
    …… 
    7069        'has_change_permission': True, 
    7170        'has_absolute_url': False, 
    72         'first_form_field_id': 'id_password1', 
    7371        'opts': User._meta, 
    7472        'original': user, 

  • django/branches/newforms-admin/django/contrib/admin/views/main.py

    r4365 r4375  
    174174    original = getattr(manipulator, 'original_object', None) 
    175175    bound_field_sets = [field_set.bind(context['oldform'], original, AdminBoundFieldSet) for field_set in field_sets] 
    176     first_form_field_id = bound_field_sets[0].bound_field_lines[0].bound_fields[0].form_fields[0].get_id(); 
    177176    ordered_objects = opts.get_ordered_objects() 
    178177    inline_related_objects = opts.get_followed_related_objects(manipulator.follow) 
    …… 
    186185        'auto_populated_fields': auto_populated_fields, 
    187186        'bound_field_sets': bound_field_sets, 
    188         'first_form_field_id': first_form_field_id, 
    189187        'javascript_imports': get_javascript_imports(opts, auto_populated_fields, field_sets), 
    190188        'ordered_objects': ordered_objects,