Change show_karton to false and don't include "karton" key in task pa…

…yload (#794)
CERT-Polska · Apr 25, 2023 · 751898c · 751898c
1 parent 22e9ce1
commit 751898c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/mwdb/model/object.py b/mwdb/model/object.py
@@ -819,7 +819,11 @@ def remove_tag(self, tag_name, commit=True):
         return is_removed
 
     def get_attributes(
-        self, as_dict=False, check_permissions=True, show_hidden=False, show_karton=True
+        self,
+        as_dict=False,
+        check_permissions=True,
+        show_hidden=False,
+        show_karton=False,
     ):
         """
         Gets all object attributes

diff --git a/mwdb/resources/attribute.py b/mwdb/resources/attribute.py
@@ -95,9 +95,7 @@ def get(self, type, identifier):
         if db_object is None:
             raise NotFound("Object not found")
 
-        attributes = db_object.get_attributes(
-            show_hidden=show_hidden, show_karton=False
-        )
+        attributes = db_object.get_attributes(show_hidden=show_hidden)
         schema = AttributeListResponseSchema()
         return schema.dump({"attributes": attributes})
 
@@ -167,7 +165,7 @@ def post(self, type, identifier):
 
         db.session.commit()
         db.session.refresh(db_object)
-        attributes = db_object.get_attributes(show_karton=False)
+        attributes = db_object.get_attributes()
         attribute = next((attr for attr in attributes if attr.key == key), None)
         if is_new:
             hooks.on_created_attribute(db_object, attribute)

diff --git a/mwdb/resources/metakey.py b/mwdb/resources/metakey.py
@@ -100,7 +100,7 @@ def get(self, type, identifier):
         if db_object is None:
             raise NotFound("Object not found")
 
-        metakeys = db_object.get_attributes(show_hidden=show_hidden)
+        metakeys = db_object.get_attributes(show_hidden=show_hidden, show_karton=True)
         schema = MetakeyListResponseSchema()
         return schema.dump({"metakeys": metakeys})
 
@@ -179,7 +179,7 @@ def post(self, type, identifier):
 
         db.session.commit()
         db.session.refresh(db_object)
-        metakeys = db_object.get_attributes()
+        metakeys = db_object.get_attributes(show_karton=True)
         schema = MetakeyListResponseSchema()
         return schema.dump({"metakeys": metakeys})
 

diff --git a/mwdb/schema/object.py b/mwdb/schema/object.py
@@ -117,7 +117,7 @@ def get_accessible_attributes(self, data, object, **kwargs):
         """
         Replace all object attributes with attributes accessible for current user
         """
-        object_attributes = object.get_attributes(show_karton=False)
+        object_attributes = object.get_attributes()
         schema = AttributeItemResponseSchema()
         attributes_serialized = schema.dump(object_attributes, many=True)
         return {**data, "attributes": attributes_serialized}