diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-14 19:37:35 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-14 19:37:35 +0200 |
| commit | 75eba6fe02babf4a4e86997578e2caf9f7ba828e (patch) | |
| tree | 251c730e3bfe366c66d495838a8dc0765003b627 /ishtar_common/model_merging.py | |
| parent | 938270b76b0526ba9bcb063a58a80d1a2e5796ec (diff) | |
| download | Ishtar-75eba6fe02babf4a4e86997578e2caf9f7ba828e.tar.bz2 Ishtar-75eba6fe02babf4a4e86997578e2caf9f7ba828e.zip | |
Django 1.8: fix import errors, deprecation warnings and models warnings
Diffstat (limited to 'ishtar_common/model_merging.py')
| -rw-r--r-- | ishtar_common/model_merging.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/model_merging.py b/ishtar_common/model_merging.py index c577a8cf1..b2ed68358 100644 --- a/ishtar_common/model_merging.py +++ b/ishtar_common/model_merging.py @@ -2,10 +2,10 @@ from django.db import transaction from django.db.models import get_models, Model -from django.contrib.contenttypes.generic import GenericForeignKey +from django.contrib.contenttypes.fields import GenericForeignKey -@transaction.commit_on_success +@transaction.atomic def merge_model_objects(primary_object, alias_objects=[], keep_old=False): """ Use this function to merge model objects (i.e. Users, Organizations, Polls, |