Django

Code

Changeset 4365

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

newforms-admin: Renamed 'form' template variable to 'oldform' in add_view() and change_view(), in preparation for the newforms switch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4364 r4365  
    250250        c = template.RequestContext(request, { 
    251251            'title': _('Add %s') % opts.verbose_name, 
    252             'form': form, 
     252            'oldform': form, 
    253253            'is_popup': request.REQUEST.has_key('_popup'), 
    254254            'show_delete': False, 
    …… 
    349349        c = template.RequestContext(request, { 
    350350            'title': _('Change %s') % opts.verbose_name, 
    351             'form': form, 
     351            'oldform': form, 
    352352            'object_id': object_id, 
    353353            'original': manipulator.original_object, 

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

    r4351 r4365  
    3535{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %} 
    3636{% if save_on_top %}{% submit_row %}{% endif %} 
    37 {% if form.error_dict %} 
     37{% if oldform.error_dict %} 
    3838    <p class="errornote"> 
    39     {% blocktrans count form.error_dict.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} 
     39    {% blocktrans count oldform.error_dict.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} 
    4040    </p> 
    4141{% endif %} 
    …… 
    5656   {% if ordered_objects %} 
    5757   <fieldset class="module"><h2>{% trans "Ordering" %}</h2> 
    58    <div class="form-row{% if form.order_.errors %} error{% endif %} "> 
    59    {% if form.order_.errors %}{{ form.order_.html_error_list }}{% endif %} 
    60    <p><label for="id_order_">{% trans "Order:" %}</label> {{ form.order_ }}</p> 
     58   <div class="form-row{% if oldform.order_.errors %} error{% endif %} "> 
     59   {% if oldform.order_.errors %}{{ oldform.order_.html_error_list }}{% endif %} 
     60   <p><label for="id_order_">{% trans "Order:" %}</label> {{ oldform.order_ }}</p> 
    6161   </div></fieldset> 
    6262   {% endif %} 

  • django/branches/newforms-admin/django/contrib/admin/templatetags/admin_modify.py

    r4343 r4365  
    166166            bound_related_object_class = relation.field.rel.edit_inline 
    167167        original = context.get('original', None) 
    168         bound_related_object = relation.bind(context['form'], original, bound_related_object_class) 
     168        bound_related_object = relation.bind(context['oldform'], original, bound_related_object_class) 
    169169        context['bound_related_object'] = bound_related_object 
    170170        t = loader.get_template(bound_related_object.template_name()) 

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

    r4354 r4365  
    173173    field_sets = model_admin.get_field_sets() 
    174174    original = getattr(manipulator, 'original_object', None) 
    175     bound_field_sets = [field_set.bind(context['form'], original, AdminBoundFieldSet) for field_set in field_sets] 
     175    bound_field_sets = [field_set.bind(context['oldform'], original, AdminBoundFieldSet) for field_set in field_sets] 
    176176    first_form_field_id = bound_field_sets[0].bound_field_lines[0].bound_fields[0].form_fields[0].get_id(); 
    177177    ordered_objects = opts.get_ordered_objects()