Skip to content

Commit

Permalink
Making it work in newers versions of django
Browse files Browse the repository at this point in the history
  • Loading branch information
jespino committed Mar 20, 2020
1 parent ec4972c commit 8018b46
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion sampledatahelper/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = (0, 4, 1)
__version__ = (0, 5, 0)
14 changes: 7 additions & 7 deletions sampledatahelper/handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,20 +150,20 @@ def _generate(self):

class ForeignKeyHandler(BaseHandler):
def _generate(self):
if self.instance.rel.limit_choices_to:
queryset = self.instance.rel.to.objects.filter(**self.instance.rel.limit_choices_to)
if self.instance.remote_field.limit_choices_to:
queryset = self.instance.remote_field.model.objects.filter(**self.instance.remote_field.limit_choices_to)
else:
queryset = self.instance.rel.to.objects.all()
queryset = self.instance.remote_field.model.objects.all()
return self.sd.db_object_from_queryset(queryset)


class OneToOneHandler(ForeignKeyHandler):
def _generate(self):
if self.instance.rel.limit_choices_to:
queryset = self.instance.rel.to.objects.filter(
**self.instance.rel.limit_choices_to
if self.instance.remote_field.limit_choices_to:
queryset = self.instance.remote_field.model.objects.filter(
**self.instance.remote_field.limit_choices_to
).exclude(id__in=self.instance.model.objects.all().values(self.instance.name))
else:
quersyet = self.instance.rel.to.objects.all()
quersyet = self.instance.remote_field.model.objects.all()
queryset = quersyet.exclude(id__in=self.instance.model.objects.all().values(self.instance.name))
return self.sd.db_object_from_queryset(queryset)

0 comments on commit 8018b46

Please sign in to comment.