Revert "Fixed #24474 -- Allowed configuring the admin's empty change list value." (1273a7a0) · Commits · Dom Sekotill / django

django/contrib/admin/filters.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -174,7 +174,6 @@ class RelatedFieldListFilter(FieldListFilter):
		else:
		self.lookup_title = other_model._meta.verbose_name
		self.title = self.lookup_title
		self.empty_value_display = model_admin.get_empty_value_display()

		def has_output(self):
		if self.field.null:
		@@ -190,6 +189,7 @@ class RelatedFieldListFilter(FieldListFilter):
		return field.get_choices(include_blank=False)

		def choices(self, cl):
		from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
		yield {
		'selected': self.lookup_val is None and not self.lookup_val_isnull,
		'query_string': cl.get_query_string({},
		@@ -210,7 +210,7 @@ class RelatedFieldListFilter(FieldListFilter):
		'query_string': cl.get_query_string({
		self.lookup_kwarg_isnull: 'True',
		}, [self.lookup_kwarg]),
		'display': self.empty_value_display,
		'display': EMPTY_CHANGELIST_VALUE,
		}

		FieldListFilter.register(lambda f: f.remote_field, RelatedFieldListFilter)
		@@ -353,7 +353,6 @@ class AllValuesFieldListFilter(FieldListFilter):
		self.lookup_val = request.GET.get(self.lookup_kwarg, None)
		self.lookup_val_isnull = request.GET.get(self.lookup_kwarg_isnull,
		None)
		self.empty_value_display = model_admin.get_empty_value_display()
		parent_model, reverse_path = reverse_field_path(model, field_path)
		# Obey parent ModelAdmin queryset when deciding which options to show
		if model == parent_model:
		@@ -371,6 +370,7 @@ class AllValuesFieldListFilter(FieldListFilter):
		return [self.lookup_kwarg, self.lookup_kwarg_isnull]

		def choices(self, cl):
		from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
		yield {
		'selected': (self.lookup_val is None
		and self.lookup_val_isnull is None),
		@@ -397,7 +397,7 @@ class AllValuesFieldListFilter(FieldListFilter):
		'query_string': cl.get_query_string({
		self.lookup_kwarg_isnull: 'True',
		}, [self.lookup_kwarg]),
		'display': self.empty_value_display,
		'display': EMPTY_CHANGELIST_VALUE,
		}

		FieldListFilter.register(lambda f: True, AllValuesFieldListFilter)

django/contrib/admin/helpers.py

+3 −4

Original line number	Diff line number	Diff line
		@@ -174,7 +174,6 @@ class AdminReadonlyField(object):
		self.is_first = is_first
		self.is_checkbox = False
		self.is_readonly = True
		self.empty_value_display = model_admin.get_empty_value_display()

		def label_tag(self):
		attrs = {}
		@@ -187,11 +186,12 @@ class AdminReadonlyField(object):

		def contents(self):
		from django.contrib.admin.templatetags.admin_list import _boolean_icon
		from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE
		field, obj, model_admin = self.field['field'], self.form.instance, self.model_admin
		try:
		f, attr, value = lookup_field(field, obj, model_admin)
		except (AttributeError, ValueError, ObjectDoesNotExist):
		result_repr = self.empty_value_display
		result_repr = EMPTY_CHANGELIST_VALUE
		else:
		if f is None:
		boolean = getattr(attr, "boolean", False)
		@@ -207,8 +207,7 @@ class AdminReadonlyField(object):
		if isinstance(f.remote_field, ManyToManyRel) and value is not None:
		result_repr = ", ".join(map(six.text_type, value.all()))
		else:
		empty_value_display = self.model_admin.get_empty_value_display()
		result_repr = display_for_field(value, f, empty_value_display)
		result_repr = display_for_field(value, f)
		return conditional_escape(result_repr)

django/contrib/admin/options.py

+0 −9

Original line number	Diff line number	Diff line
		@@ -814,15 +814,6 @@ class ModelAdmin(BaseModelAdmin):
		description = capfirst(action.replace('_', ' '))
		return func, action, description

		def get_empty_value_display(self):
		"""
		Return the empty_value_display set on ModelAdmin or AdminSite.
		"""
		try:
		return mark_safe(self.empty_value_display)
		except AttributeError:
		return mark_safe(self.admin_site.empty_value_display)

		def get_list_display(self, request):
		"""
		Return a sequence containing the fields to be displayed on the

django/contrib/admin/sites.py

+0 −10

Original line number	Diff line number	Diff line
		@@ -48,8 +48,6 @@ class AdminSite(object):
		# URL for the "View site" link at the top of each admin page.
		site_url = '/'

		_empty_value_display = '-'

		login_form = None
		index_template = None
		app_index_template = None
		@@ -156,14 +154,6 @@ class AdminSite(object):
		"""
		return six.iteritems(self._actions)

		@property
		def empty_value_display(self):
		return self._empty_value_display

		@empty_value_display.setter
		def empty_value_display(self, empty_value_display):
		self._empty_value_display = empty_value_display

		def has_permission(self, request):
		"""
		Returns True if the given HttpRequest has permission to view

django/contrib/admin/templatetags/admin_list.py

+6 −8

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ from django.contrib.admin.utils import (
		display_for_field, display_for_value, label_for_field, lookup_field,
		)
		from django.contrib.admin.views.main import (
		ALL_VAR, ORDER_VAR, PAGE_VAR, SEARCH_VAR,
		ALL_VAR, EMPTY_CHANGELIST_VALUE, ORDER_VAR, PAGE_VAR, SEARCH_VAR,
		)
		from django.core.exceptions import ObjectDoesNotExist
		from django.core.urlresolvers import NoReverseMatch
		@@ -194,22 +194,20 @@ def items_for_result(cl, result, form):
		first = True
		pk = cl.lookup_opts.pk.attname
		for field_name in cl.list_display:
		empty_value_display = cl.model_admin.get_empty_value_display()
		row_classes = ['field-%s' % field_name]
		try:
		f, attr, value = lookup_field(field_name, result, cl.model_admin)
		except ObjectDoesNotExist:
		result_repr = empty_value_display
		result_repr = EMPTY_CHANGELIST_VALUE
		else:
		empty_value_display = getattr(attr, 'empty_value_display', empty_value_display)
		if f is None:
		if field_name == 'action_checkbox':
		row_classes = ['action-checkbox']
		allow_tags = getattr(attr, 'allow_tags', False)
		boolean = getattr(attr, 'boolean', False)
		if boolean or not value:
		if boolean:
		allow_tags = True
		result_repr = display_for_value(value, empty_value_display, boolean)
		result_repr = display_for_value(value, boolean)
		# Strip HTML tags in the resulting text, except if the
		# function has an "allow_tags" attribute set to True.
		if allow_tags:
		@@ -220,11 +218,11 @@ def items_for_result(cl, result, form):
		if isinstance(f.remote_field, models.ManyToOneRel):
		field_val = getattr(result, f.name)
		if field_val is None:
		result_repr = empty_value_display
		result_repr = EMPTY_CHANGELIST_VALUE
		else:
		result_repr = field_val
		else:
		result_repr = display_for_field(value, f, empty_value_display)
		result_repr = display_for_field(value, f)
		if isinstance(f, (models.DateField, models.TimeField, models.ForeignKey)):
		row_classes.append('nowrap')
		if force_text(result_repr) == '':