mirror of
https://github.com/django/django.git
synced 2025-07-04 17:59:13 +00:00
Fix for #743
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
29cce749fa
commit
b93bab5ca1
@ -43,7 +43,7 @@ def submit_row(context, bound_manipulator):
|
||||
}
|
||||
submit_row = inclusion_tag('admin/submit_line', takes_context=True)(submit_row)
|
||||
|
||||
#@simple_tag
|
||||
#@simple_tag
|
||||
def field_label(bound_field):
|
||||
class_names = []
|
||||
if isinstance(bound_field.field, meta.BooleanField):
|
||||
@ -92,7 +92,6 @@ class FieldWidgetNode(template.Node):
|
||||
return cls.nodelists[klass]
|
||||
get_nodelist = classmethod(get_nodelist)
|
||||
|
||||
|
||||
def render(self, context):
|
||||
|
||||
bound_field = template.resolve_variable(self.bound_field_var, context)
|
||||
@ -118,8 +117,6 @@ class FieldWrapper(object):
|
||||
return isinstance(self.field.rel, (meta.ManyToOne, meta.ManyToMany)) \
|
||||
and self.field.rel.raw_id_admin
|
||||
|
||||
|
||||
|
||||
class FormFieldCollectionWrapper(object):
|
||||
def __init__(self, field_mapping, fields):
|
||||
self.field_mapping = field_mapping
|
||||
@ -127,12 +124,11 @@ class FormFieldCollectionWrapper(object):
|
||||
self.bound_fields = [AdminBoundField(field, self.field_mapping, field_mapping['original'])
|
||||
for field in self.fields ]
|
||||
|
||||
|
||||
class TabularBoundRelatedObject(BoundRelatedObject):
|
||||
def __init__(self, related_object, field_mapping, original):
|
||||
super(TabularBoundRelatedObject, self).__init__(related_object, field_mapping, original)
|
||||
self.field_wrapper_list = self.relation.editable_fields(FieldWrapper)
|
||||
|
||||
|
||||
fields = self.relation.editable_fields()
|
||||
|
||||
self.form_field_collection_wrappers = [FormFieldCollectionWrapper(field_mapping ,fields)
|
||||
|
@ -189,7 +189,7 @@ class BooleanFieldFilterSpec(FilterSpec):
|
||||
'display': k
|
||||
}
|
||||
if isinstance(self.field, meta.NullBooleanField):
|
||||
yield { 'selected' : lookup_val2 == 'True',
|
||||
yield { 'selected' : self.lookup_val2 == 'True',
|
||||
'query_string' : cl.get_query_string( {self.lookup_kwarg2: 'True'}, [self.lookup_kwarg]),
|
||||
'display': _('Unknown')
|
||||
}
|
||||
|
@ -204,7 +204,7 @@ class HttpResponse:
|
||||
|
||||
def tell(self):
|
||||
return len(self.content)
|
||||
|
||||
|
||||
class HttpResponseRedirect(HttpResponse):
|
||||
def __init__(self, redirect_to):
|
||||
HttpResponse.__init__(self)
|
||||
|
Loading…
x
Reference in New Issue
Block a user