From b93bab5ca1aee6e608904c97c8f70206b2bcde5e Mon Sep 17 00:00:00 2001 From: Robert Wittams Date: Wed, 9 Nov 2005 11:39:57 +0000 Subject: [PATCH] Fix for #743 git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1138 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/templatetags/admin_modify.py | 8 ++------ django/contrib/admin/views/main.py | 2 +- django/utils/httpwrappers.py | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/django/contrib/admin/templatetags/admin_modify.py b/django/contrib/admin/templatetags/admin_modify.py index 1600804644..4b03beb53a 100644 --- a/django/contrib/admin/templatetags/admin_modify.py +++ b/django/contrib/admin/templatetags/admin_modify.py @@ -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) diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 99be09578b..8e50911316 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -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') } diff --git a/django/utils/httpwrappers.py b/django/utils/httpwrappers.py index c1aa9d6ee1..930f4961f0 100644 --- a/django/utils/httpwrappers.py +++ b/django/utils/httpwrappers.py @@ -204,7 +204,7 @@ class HttpResponse: def tell(self): return len(self.content) - + class HttpResponseRedirect(HttpResponse): def __init__(self, redirect_to): HttpResponse.__init__(self)