Loading django/contrib/admin/helpers.py +2 −1 Original line number Diff line number Diff line Loading @@ -42,7 +42,8 @@ class AdminForm(object): def __iter__(self): for name, options in self.fieldsets: yield Fieldset(self.form, name, yield Fieldset( self.form, name, readonly_fields=self.readonly_fields, model_admin=self.model_admin, **options Loading django/contrib/admin/options.py +4 −2 Original line number Diff line number Diff line Loading @@ -1520,7 +1520,8 @@ class ModelAdmin(BaseModelAdmin): selection_note_all = ungettext('%(total_count)s selected', 'All %(total_count)s selected', cl.result_count) context = dict(self.admin_site.each_context(), context = dict( self.admin_site.each_context(), module_name=force_text(opts.verbose_name_plural), selection_note=_('0 of %(cnt)s selected') % {'cnt': len(cl.result_list)}, selection_note_all=selection_note_all % {'total_count': cl.result_count}, Loading Loading @@ -1587,7 +1588,8 @@ class ModelAdmin(BaseModelAdmin): else: title = _("Are you sure?") context = dict(self.admin_site.each_context(), context = dict( self.admin_site.each_context(), title=title, object_name=object_name, object=obj, Loading django/contrib/admin/sites.py +2 −1 Original line number Diff line number Diff line Loading @@ -398,7 +398,8 @@ class AdminSite(object): for app in app_list: app['models'].sort(key=lambda x: x['name']) context = dict(self.each_context(), context = dict( self.each_context(), title=self.index_title, app_list=app_list, ) Loading django/contrib/admin/templatetags/admin_list.py +2 −1 Original line number Diff line number Diff line Loading @@ -95,7 +95,8 @@ def result_headers(cl): """ ordering_field_columns = cl.get_ordering_field_columns() for i, field_name in enumerate(cl.list_display): text, attr = label_for_field(field_name, cl.model, text, attr = label_for_field( field_name, cl.model, model_admin=cl.model_admin, return_attr=True ) Loading django/contrib/admindocs/tests/test_fields.py +2 −1 Original line number Diff line number Diff line Loading @@ -21,7 +21,8 @@ class TestFieldType(unittest.TestCase): pass def test_field_name(self): self.assertRaises(AttributeError, self.assertRaises( AttributeError, views.get_readable_field_data_type, "NotAField" ) Loading Loading
django/contrib/admin/helpers.py +2 −1 Original line number Diff line number Diff line Loading @@ -42,7 +42,8 @@ class AdminForm(object): def __iter__(self): for name, options in self.fieldsets: yield Fieldset(self.form, name, yield Fieldset( self.form, name, readonly_fields=self.readonly_fields, model_admin=self.model_admin, **options Loading
django/contrib/admin/options.py +4 −2 Original line number Diff line number Diff line Loading @@ -1520,7 +1520,8 @@ class ModelAdmin(BaseModelAdmin): selection_note_all = ungettext('%(total_count)s selected', 'All %(total_count)s selected', cl.result_count) context = dict(self.admin_site.each_context(), context = dict( self.admin_site.each_context(), module_name=force_text(opts.verbose_name_plural), selection_note=_('0 of %(cnt)s selected') % {'cnt': len(cl.result_list)}, selection_note_all=selection_note_all % {'total_count': cl.result_count}, Loading Loading @@ -1587,7 +1588,8 @@ class ModelAdmin(BaseModelAdmin): else: title = _("Are you sure?") context = dict(self.admin_site.each_context(), context = dict( self.admin_site.each_context(), title=title, object_name=object_name, object=obj, Loading
django/contrib/admin/sites.py +2 −1 Original line number Diff line number Diff line Loading @@ -398,7 +398,8 @@ class AdminSite(object): for app in app_list: app['models'].sort(key=lambda x: x['name']) context = dict(self.each_context(), context = dict( self.each_context(), title=self.index_title, app_list=app_list, ) Loading
django/contrib/admin/templatetags/admin_list.py +2 −1 Original line number Diff line number Diff line Loading @@ -95,7 +95,8 @@ def result_headers(cl): """ ordering_field_columns = cl.get_ordering_field_columns() for i, field_name in enumerate(cl.list_display): text, attr = label_for_field(field_name, cl.model, text, attr = label_for_field( field_name, cl.model, model_admin=cl.model_admin, return_attr=True ) Loading
django/contrib/admindocs/tests/test_fields.py +2 −1 Original line number Diff line number Diff line Loading @@ -21,7 +21,8 @@ class TestFieldType(unittest.TestCase): pass def test_field_name(self): self.assertRaises(AttributeError, self.assertRaises( AttributeError, views.get_readable_field_data_type, "NotAField" ) Loading