Hopiu/django-modeltranslation
1
0
Fork 0
mirror of https://github.com/Hopiu/django-modeltranslation.git synced 2026-05-09 22:04:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #447 from abdolhosein/patch-the-issue-with-django2

Browse source 
Patches the issue with the Django 2.0 release. It Fixes #436
This commit is contained in:
Dirk Eschler 2018-01-23 16:46:06 +01:00 committed by GitHub
commit 5459356e7e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modeltranslation/manager.py
View file

@ -231,7 +231,9 @@ class MultilingualQuerySet(models.query.QuerySet):
kwargs.setdefault('fields_to_del', self.fields_to_del)
if hasattr(self, 'original_fields'):
kwargs.setdefault('original_fields', self.original_fields)
return super(MultilingualQuerySet, self)._clone(**kwargs)
cloned = super(MultilingualQuerySet, self)._clone()
cloned.__dict__.update(kwargs)
return cloned
else:
def _clone(self, klass=None, *args, **kwargs):
if klass is not None and not issubclass(klass, MultilingualQuerySet):
@ -241,7 +243,12 @@ class MultilingualQuerySet(models.query.QuerySet):
klass = NewClass
kwargs.setdefault('_rewrite', self._rewrite)
kwargs.setdefault('_populate', self._populate)
return super(MultilingualQuerySet, self)._clone(klass, *args, **kwargs)
cloned = super(MultilingualQuerySet, self)._clone()
cloned.__dict__.update(kwargs)
if klass is not None:
cloned.__class__ = klass
return cloned
# This method was not present in django-linguo
def rewrite(self, mode=True):