mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 02:23:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2270 from bmispelon/ticket-22030

Browse source 
Fixed #22030 -- Don't assume that all fields have a swappable_setting at...
This commit is contained in:
Andrew Godwin 2014-02-17 01:16:49 +00:00
commit 3c547a423f
2 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
django/db/migrations/autodetector.py
View file

@ -235,7 +235,8 @@ class MigrationAutodetector(object):
field=field,
)
)
swappable_setting = new_apps.get_model(app_label, model_name)._meta.get_field_by_name(field_name)[0].swappable_setting
new_field = new_apps.get_model(app_label, model_name)._meta.get_field_by_name(field_name)[0]
swappable_setting = getattr(new_field, 'swappable_setting', None)
if swappable_setting is not None:
self.add_swappable_dependency(app_label, swappable_setting)
# Old fields