mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-05 00:00:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into schema-alteration

Browse source
This commit is contained in:
Andrew Godwin 2013-05-18 10:21:31 +02:00
commit b31eea069c
162 changed files with 2460 additions and 1346 deletions
Download patch file Download diff file Expand all files Collapse all files

2
django/db/models/options.py
View file

@ -349,7 +349,7 @@ class Options(object):
"""
Returns the requested field by name. Raises FieldDoesNotExist on error.
"""
to_search = many_to_many and (self.fields + self.many_to_many) or self.fields
to_search = (self.fields + self.many_to_many) if many_to_many else self.fields
for f in to_search:
if f.name == name:
return f