Merge pull request #14 from johnrtipton/master

Compatibility with django-polymorphic
This commit is contained in:
Jan-Jelle Kester 2015-04-29 12:06:37 +02:00
commit f54623d3c1

View file

@ -72,7 +72,12 @@ class LogEntryManager(models.Manager):
Get the primary key field value for a model instance.
"""
pk_field = instance._meta.pk.name
return getattr(instance, pk_field, None)
pk = getattr(instance, pk_field, None)
# Check to make sure that we got an pk not a model object.
if isinstance(pk, models.Model):
pk = self._get_pk_value(pk)
return pk
class LogEntry(models.Model):