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

Rework version name method to avoid blank names on eventchecklist vehicles/crew

Browse Source
This commit is contained in:
FreneticScribbler
2020-10-24 19:38:11 +01:00
parent e6eed9f2f2
commit 20d4ddd5cf
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
versioning/versioning.py
View File

@@ -114,7 +114,6 @@ class ModelComparison(object):
if oldValue != newValue and not bothBlank:
comparison = FieldComparison(field, oldValue, newValue)
changes.append(comparison)
return changes
@cached_property
@@ -143,17 +142,6 @@ class ModelComparison(object):
except KeyError: # there's no matching old version, so add this item to the dictionary by itself
compare = ModelComparison(new=version._object_version.object, **comparisonParams)
if compare.new:
if(hasattr(compare.new, 'activity_feed_string')):
compare.name = compare.new.activity_feed_string
else:
compare.name = str(compare.new)
else:
if(hasattr(compare.old, 'activity_feed_string')):
compare.name = compare.old.activity_feed_string
else:
compare.name = str(compare.old)
item_dict[version.object_id] = compare # update the dictionary with the changes
changes = []
@@ -163,6 +151,19 @@ class ModelComparison(object):
return changes
@cached_property
def name(self):
if self.new:
if(hasattr(self.new, 'activity_feed_string')):
return self.new.activity_feed_string
else:
return str(compare.new)
else:
if(hasattr(self.old, 'activity_feed_string')):
return self.old.activity_feed_string
elif str(self.old):
return str(self.old)
@cached_property
def items_changed(self):
return self.item_changes is not None and len(self.item_changes) > 0