mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

[1.8.x] Reverted "Fixed #24146 -- Fixed a missing fields regression in admin checks."

Browse Source 
This reverts commit e8171daf0c.

A new solution is forthcoming.

Backport of 0e489c19f1 from master
This commit is contained in:
Tim Graham
2015-02-03 15:12:28 -05:00
parent ff39de1e1e
commit 92d5bedc56
2 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
django/db/models/options.py
View File

@@ -487,12 +487,6 @@ class Options(object):
@cached_property
def fields_map(self):
return self._get_fields_map()
def _get_fields_map(self):
# Helper method to provide a way to access this without caching it.
# For example, admin checks run before the app cache is ready and we
# need to be able to lookup fields before we cache the final result.
res = {}
fields = self._get_fields(forward=False, include_hidden=True)
for field in fields:
@@ -537,26 +531,20 @@ class Options(object):
return field
except KeyError:
pass
if m2m_in_kwargs:
# Previous API does not allow searching reverse fields.
raise FieldDoesNotExist('%s has no field named %r' % (self.object_name, field_name))
# If the app registry is not ready, reverse fields are probably
# unavailable, but try anyway.
if not self.apps.ready:
try:
# Don't cache results
return self._get_fields_map()[field_name]
except KeyError:
# If the app registry is not ready, reverse fields are
# unavailable, therefore we throw a FieldDoesNotExist exception.
if not self.apps.ready:
raise FieldDoesNotExist(
"%s has no field named %r. The app cache isn't ready yet, "
"so if this is an auto-created related field, it might not "
"so if this is an auto-created related field, it won't "
"be available yet." % (self.object_name, field_name)
)
try:
if m2m_in_kwargs:
# Previous API does not allow searching reverse fields.
raise FieldDoesNotExist('%s has no field named %r' % (self.object_name, field_name))
# Retrieve field instance by name from cached or just-computed
# field map.
return self.fields_map[field_name]