Skip to content

Commit

Permalink
Bugfix: Deleted inline admin instances no longer added to revision. C…
Browse files Browse the repository at this point in the history
…loses #605
  • Loading branch information
etianen committed Dec 19, 2016
1 parent 0ee0a42 commit 71ad022
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
django-reversion changelog
==========================

Development
-----------

- Bugfix: Deleted inline admin instances no longer added to revision.


2.0.8 - 28/11/2016
------------------

Expand Down
20 changes: 19 additions & 1 deletion reversion/revisions.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from __future__ import unicode_literals
from collections import namedtuple
from collections import namedtuple, defaultdict
from contextlib import contextmanager
from functools import wraps
from threading import local
Expand Down Expand Up @@ -214,6 +214,24 @@ def add_to_revision(obj, model_db=None):

def _save_revision(versions, user=None, comment="", meta=(), date_created=None, using=None):
from reversion.models import Revision
# Only save versions that exist in the database.
model_db_pks = defaultdict(lambda: defaultdict(set))
for version in versions:
model_db_pks[version._model][version.db].add(version.object_id)
model_db_existing_pks = {
model: {
db: frozenset(map(
force_text,
model._default_manager.using(db).filter(pk__in=pks).values_list("pk", flat=True),
))
for db, pks in db_pks.items()
}
for model, db_pks in model_db_pks.items()
}
versions = [
version for version in versions
if version.object_id in model_db_existing_pks[version._model][version.db]
]
# Bail early if there are no objects to save.
if not versions:
return
Expand Down

0 comments on commit 71ad022

Please sign in to comment.