arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-02 13:22:17 +00:00
Code Issues Projects Releases Wiki Activity

Fixed versioning UI for revisions containing multiple event versions, hopefully

Browse Source
This commit is contained in:
David Taylor
2016-04-07 00:19:18 +01:00
parent 71b69aa0f6
commit b47cfed5a9
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
RIGS/versioning.py
View File

@@ -119,17 +119,19 @@ def compare_event_items(old, new):
# Build some dicts of what we have # Build some dicts of what we have
item_dict = {} # build a list of items, key is the item_pk item_dict = {} # build a list of items, key is the item_pk
for version in old_item_versions: # put all the old versions in a list for version in old_item_versions: # put all the old versions in a list
compare = ItemCompare(old=version.object_version.object) if version.object_version.object.event.id == old.object_id:
item_dict[version.object_id] = compare compare = ItemCompare(old=version.object_version.object)
item_dict[version.object_id] = compare
for version in new_item_versions: # go through the new versions for version in new_item_versions: # go through the new versions
try: if version.object_version.object.event.id == new.object_id:
compare = item_dict[version.object_id] # see if there's a matching old version try:
compare.new = version.object_version.object # then add the new version to the dictionary compare = item_dict[version.object_id] # see if there's a matching old version
except KeyError: # there's no matching old version, so add this item to the dictionary by itself compare.new = version.object_version.object # then add the new version to the dictionary
compare = ItemCompare(new=version.object_version.object) except KeyError: # there's no matching old version, so add this item to the dictionary by itself
compare = ItemCompare(new=version.object_version.object)
item_dict[version.object_id] = compare # update the dictionary with the changes item_dict[version.object_id] = compare # update the dictionary with the changes
changes = [] changes = []
for (_, compare) in item_dict.items(): for (_, compare) in item_dict.items():