mirror of
https://github.com/django/django.git
synced 2025-07-05 02:09:13 +00:00
Small fixes: context for add_stage was wrong, and labels for booleans.
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
f114e652e3
commit
b335fab55e
@ -52,16 +52,18 @@ def field_label(bound_field):
|
|||||||
class_names = []
|
class_names = []
|
||||||
if isinstance(bound_field.field, meta.BooleanField):
|
if isinstance(bound_field.field, meta.BooleanField):
|
||||||
class_names.append("vCheckboxLabel")
|
class_names.append("vCheckboxLabel")
|
||||||
|
colon = ""
|
||||||
else:
|
else:
|
||||||
if not bound_field.field.blank:
|
if not bound_field.field.blank:
|
||||||
class_names.append('required')
|
class_names.append('required')
|
||||||
if not bound_field.first:
|
if not bound_field.first:
|
||||||
class_names.append('inline')
|
class_names.append('inline')
|
||||||
|
colon = ":"
|
||||||
|
|
||||||
class_str = class_names and ' class="%s"' % ' '.join(class_names) or ''
|
class_str = class_names and ' class="%s"' % ' '.join(class_names) or ''
|
||||||
return '<label for="%s"%s>%s:</label> ' % \
|
return '<label for="%s"%s>%s%s</label> ' % \
|
||||||
(bound_field.element_id, class_str,
|
(bound_field.element_id, class_str,
|
||||||
capfirst(bound_field.field.verbose_name) )
|
capfirst(bound_field.field.verbose_name), colon )
|
||||||
field_label = simple_tag(field_label)
|
field_label = simple_tag(field_label)
|
||||||
|
|
||||||
|
|
||||||
|
@ -711,7 +711,7 @@ def add_stage_new(request, app_label, module_name, show_delete=False, form_url='
|
|||||||
c['object_id'] = object_id_override
|
c['object_id'] = object_id_override
|
||||||
|
|
||||||
|
|
||||||
fill_extra_context(opts, app_label, c, change=True)
|
fill_extra_context(opts, app_label, c, change=False)
|
||||||
|
|
||||||
return render_to_response("admin_change_form", context_instance=c)
|
return render_to_response("admin_change_form", context_instance=c)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user