Merge pull request #80 from realifetech/CTD-2090-tdc---be-add-additon…

…alfields-to CTD-2090 change variables
realifetech · May 30, 2022 · 4a96a46 · 4a96a46
2 parents 70f6d93 + 913abc9
commit 4a96a46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/livestyled/__init__.py b/livestyled/__init__.py
@@ -1 +1 @@
-__version__ = '1.3.6'
+__version__ = '1.3.7'
diff --git a/livestyled/models/tests/test_ticket.py b/livestyled/models/tests/test_ticket.py
@@ -81,7 +81,7 @@ def test_ticket_difference():
             'dataType': 'string'
         }])
 
-    difference = current.diff(new)
+    difference = new.diff(current)
 
     assert difference == {
         'additional_fields': [

diff --git a/livestyled/models/ticket.py b/livestyled/models/ticket.py
@@ -385,8 +385,8 @@ def diff(self, other):
             if getattr(self, field) != getattr(other, field):
                 if field == 'additional_fields':
                     additional_fields = []
-                    for current in getattr(self, field):
-                        for new in getattr(other, field):
+                    for current in getattr(other, field):
+                        for new in getattr(self, field):
                             if current['sort'] == new['sort']:
                                 for key in current.keys():
                                     current[key] = new[key]