Further minor fixes to versioning

nottinghamtec · Dec 27, 2020 · 72221e4 · 72221e4
1 parent 0e656b4
commit 72221e4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/RIGS/models.py b/RIGS/models.py
@@ -609,7 +609,7 @@ def __str__(self):
 
     @property
     def activity_feed_string(self):
-        return str("payment at £{}".format(self.amount))
+        return str("payment of £{}".format(self.amount))
 
 
 def validate_url(value):

diff --git a/versioning/versioning.py b/versioning/versioning.py
@@ -153,16 +153,12 @@ def item_changes(self):
 
     @cached_property
     def name(self):
-        if self.new:
-            if(hasattr(self.new, 'activity_feed_string')):
-                return self.new.activity_feed_string
-            else:
-                return str(self.new)
+        obj = self.new if self.new else self.old
+
+        if(hasattr(obj, 'activity_feed_string')):
+            return obj.activity_feed_string
         else:
-            if(hasattr(self.old, 'activity_feed_string')):
-                return self.old.activity_feed_string
-            elif str(self.old):
-                return str(self.old)
+            return str(obj)
 
     @cached_property
     def items_changed(self):