commit 415e0fb13f04004a9223b2a778b1076cef912275
author Scott Baker <smbaker@gmail.com> Wed Aug 01 14:42:33 2018 -0700
committer Scott Baker <smbaker@gmail.com> Wed Aug 01 14:42:33 2018 -0700
tree 0edc65f107ebb42c5e1d05bd16bf9ffc984ead06
parent d8246710a3726b73efca0a44199c3bb08d5bb5bb

CORD-3088 Prevent misleading error messages when updating deleted objs

Change-Id: I71e2844badea2977a34f30af1422a0331570efc7

xos/coreapi/apihelper.py

diff --git a/xos/coreapi/apihelper.py b/xos/coreapi/apihelper.py
index afe50b9..ae2102c 100644
--- a/xos/coreapi/apihelper.py
+++ b/xos/coreapi/apihelper.py
@@ -517,7 +517,9 @@
 
             obj.save(**save_kwargs)
 
-            self.handle_m2m(obj, message, m2m_update_fields)
+            # CORD-3088: Do not call handle_m2m for deleted objects
+            if not obj.deleted:
+                self.handle_m2m(obj, message, m2m_update_fields)
 
             return self.objToProto(obj)
         except: