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

Fix for #743

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Robert Wittams 2005-11-09 11:39:57 +00:00
parent 29cce749fa
commit b93bab5ca1
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ def submit_row(context, bound_manipulator):
} }
submit_row = inclusion_tag('admin/submit_line', takes_context=True)(submit_row) submit_row = inclusion_tag('admin/submit_line', takes_context=True)(submit_row)
#@simple_tag #@simple_tag
def field_label(bound_field): def field_label(bound_field):
class_names = [] class_names = []
if isinstance(bound_field.field, meta.BooleanField): if isinstance(bound_field.field, meta.BooleanField):
@ -92,7 +92,6 @@ class FieldWidgetNode(template.Node):
return cls.nodelists[klass] return cls.nodelists[klass]
get_nodelist = classmethod(get_nodelist) get_nodelist = classmethod(get_nodelist)
def render(self, context): def render(self, context):
bound_field = template.resolve_variable(self.bound_field_var, 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)) \ return isinstance(self.field.rel, (meta.ManyToOne, meta.ManyToMany)) \
and self.field.rel.raw_id_admin and self.field.rel.raw_id_admin
class FormFieldCollectionWrapper(object): class FormFieldCollectionWrapper(object):
def __init__(self, field_mapping, fields): def __init__(self, field_mapping, fields):
self.field_mapping = field_mapping self.field_mapping = field_mapping
@ -127,12 +124,11 @@ class FormFieldCollectionWrapper(object):
self.bound_fields = [AdminBoundField(field, self.field_mapping, field_mapping['original']) self.bound_fields = [AdminBoundField(field, self.field_mapping, field_mapping['original'])
for field in self.fields ] for field in self.fields ]
class TabularBoundRelatedObject(BoundRelatedObject): class TabularBoundRelatedObject(BoundRelatedObject):
def __init__(self, related_object, field_mapping, original): def __init__(self, related_object, field_mapping, original):
super(TabularBoundRelatedObject, self).__init__(related_object, field_mapping, original) super(TabularBoundRelatedObject, self).__init__(related_object, field_mapping, original)
self.field_wrapper_list = self.relation.editable_fields(FieldWrapper) self.field_wrapper_list = self.relation.editable_fields(FieldWrapper)
fields = self.relation.editable_fields() fields = self.relation.editable_fields()
self.form_field_collection_wrappers = [FormFieldCollectionWrapper(field_mapping ,fields) self.form_field_collection_wrappers = [FormFieldCollectionWrapper(field_mapping ,fields)

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

@ -189,7 +189,7 @@ class BooleanFieldFilterSpec(FilterSpec):
'display': k 'display': k
} }
if isinstance(self.field, meta.NullBooleanField): 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]), 'query_string' : cl.get_query_string( {self.lookup_kwarg2: 'True'}, [self.lookup_kwarg]),
'display': _('Unknown') 'display': _('Unknown')
} }

2
django/utils/httpwrappers.py
View File

@ -204,7 +204,7 @@ class HttpResponse:
def tell(self): def tell(self):
return len(self.content) return len(self.content)
class HttpResponseRedirect(HttpResponse): class HttpResponseRedirect(HttpResponse):
def __init__(self, redirect_to): def __init__(self, redirect_to):
HttpResponse.__init__(self) HttpResponse.__init__(self)