From 42609e5c75728b1d98e3ef170120ffe0bceff0a5 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 8 Jun 2022 17:20:31 +0200
Subject: ID: allow use "data" field to generate ID

---
 ishtar_common/utils.py   | 14 ++++++++++----
 ishtar_common/version.py |  4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'ishtar_common')

diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index bad6399df..5bd5f4ec5 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -1943,10 +1943,16 @@ def _update_gen_id_dct(item, dct, initial_key, fkey=None, filters=None):
         return
     obj = item
     for k in fkey.split("__"):
-        try:
-            obj = getattr(obj, k)
-        except (ObjectDoesNotExist, AttributeError):
-            obj = None
+        if isinstance(obj, dict):
+            if k not in obj:
+                obj = None
+                break
+            obj = obj[k]
+        else:
+            try:
+                obj = getattr(obj, k)
+            except (ObjectDoesNotExist, AttributeError):
+                obj = None
         if hasattr(obj, "all") and hasattr(obj, "count"):  # query manager
             if not obj.count():
                 break
diff --git a/ishtar_common/version.py b/ishtar_common/version.py
index 276033fb0..89fcb4e7d 100644
--- a/ishtar_common/version.py
+++ b/ishtar_common/version.py
@@ -1,5 +1,5 @@
-# 3.1.73
-VERSION = (3, 1, 73)
+# 3.1.74
+VERSION = (3, 1, 74)
 
 
 def get_version():
-- 
cgit v1.2.3