✨ adapt sheet to manage sheet filters

1 files changed, 11 insertions, 4 deletions

diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index 9570687bf..639af1e88 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -386,11 +386,13 @@ def filter_sheet(ishtar_user, item):
     if exclude is None:
         return item
     base_keys = [
-        "id", "pk", "locked", "is_locked", "SLUG", "APP", "MODEL",
-        "HAS_QR_CODE", "get_absolute_url", "get_extra_actions",
-        "get_extra_templates", "can_edit", "can_delete", "DELETE_URL"
+        "SLUG", "APP", "MODEL", "DELETE_URL" "HAS_QR_CODE",
+        "id", "pk", "app_label", "model_name", "locked", "is_locked",
+        "get_absolute_url", "get_extra_actions", "get_extra_templates",
+        "can_edit", "can_delete"
     ]
     base_keys += getattr(item, "SHEET_BASE_KEYS", [])
+    empty_keys = getattr(item, "SHEET_EMPTY_KEYS", [])
     if exclude:
         # cannot exclude base keys
         len_keys = len(keys)
@@ -401,9 +403,14 @@ def filter_sheet(ishtar_user, item):
         keys += base_keys
     if exclude:
         for key in keys:
-            setattr(item, key, None)
+            try:
+                setattr(item, key, None)
+            except TypeError:
+                pass
         return item
     new_item = type("BaseObject", (object,), {})
+    for empty_key in empty_keys:
+        setattr(new_item, empty_key, None)
     for key in keys:
         setattr(new_item, key, getattr(item, key, None))
     return new_item