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

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

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@4365 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2007-01-20 06:32:08 +00:00
parent 846394d2e2
commit 5b5930f0df
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,7 @@ class ModelAdmin(object):
c = template.RequestContext(request, { c = template.RequestContext(request, {
'title': _('Add %s') % opts.verbose_name, 'title': _('Add %s') % opts.verbose_name,
'form': form, 'oldform': form,
'is_popup': request.REQUEST.has_key('_popup'), 'is_popup': request.REQUEST.has_key('_popup'),
'show_delete': False, 'show_delete': False,
}) })
@ -348,7 +348,7 @@ class ModelAdmin(object):
c = template.RequestContext(request, { c = template.RequestContext(request, {
'title': _('Change %s') % opts.verbose_name, 'title': _('Change %s') % opts.verbose_name,
'form': form, 'oldform': form,
'object_id': object_id, 'object_id': object_id,
'original': manipulator.original_object, 'original': manipulator.original_object,
'is_popup': request.REQUEST.has_key('_popup'), 'is_popup': request.REQUEST.has_key('_popup'),

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

@ -34,9 +34,9 @@
<div> <div>
{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %} {% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
{% if save_on_top %}{% submit_row %}{% endif %} {% if save_on_top %}{% submit_row %}{% endif %}
{% if form.error_dict %} {% if oldform.error_dict %}
<p class="errornote"> <p class="errornote">
{% blocktrans count form.error_dict.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} {% blocktrans count oldform.error_dict.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
</p> </p>
{% endif %} {% endif %}
{% for bound_field_set in bound_field_sets %} {% for bound_field_set in bound_field_sets %}
@ -55,9 +55,9 @@
{% if change %} {% if change %}
{% if ordered_objects %} {% if ordered_objects %}
<fieldset class="module"><h2>{% trans "Ordering" %}</h2> <fieldset class="module"><h2>{% trans "Ordering" %}</h2>
<div class="form-row{% if form.order_.errors %} error{% endif %} "> <div class="form-row{% if oldform.order_.errors %} error{% endif %} ">
{% if form.order_.errors %}{{ form.order_.html_error_list }}{% endif %} {% if oldform.order_.errors %}{{ oldform.order_.html_error_list }}{% endif %}
<p><label for="id_order_">{% trans "Order:" %}</label> {{ form.order_ }}</p> <p><label for="id_order_">{% trans "Order:" %}</label> {{ oldform.order_ }}</p>
</div></fieldset> </div></fieldset>
{% endif %} {% endif %}
{% endif %} {% endif %}

2
django/contrib/admin/templatetags/admin_modify.py
View File

@ -165,7 +165,7 @@ class EditInlineNode(template.Node):
else: else:
bound_related_object_class = relation.field.rel.edit_inline bound_related_object_class = relation.field.rel.edit_inline
original = context.get('original', None) original = context.get('original', None)
bound_related_object = relation.bind(context['form'], original, bound_related_object_class) bound_related_object = relation.bind(context['oldform'], original, bound_related_object_class)
context['bound_related_object'] = bound_related_object context['bound_related_object'] = bound_related_object
t = loader.get_template(bound_related_object.template_name()) t = loader.get_template(bound_related_object.template_name())
output = t.render(context) output = t.render(context)

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

@ -172,7 +172,7 @@ def render_change_form(model_admin, model, manipulator, context, add=False, chan
auto_populated_fields = [f for f in opts.fields if f.prepopulate_from] auto_populated_fields = [f for f in opts.fields if f.prepopulate_from]
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['form'], 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(); 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)