diff --git a/CHANGES.rst b/CHANGES.rst index 11ebac5..b8bf6de 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,8 @@ Changelog 1.16.5 (unreleased) ------------------- -- Nothing changed yet. +- Removed 'to_sign' and 'signed' fields from scanbehavior. + [chris-adam] 1.16.4 (2025-06-24) diff --git a/setup.py b/setup.py index b4c9a79..3231624 100644 --- a/setup.py +++ b/setup.py @@ -48,10 +48,10 @@ "plone.directives.form", "collective.contact.core", "collective.dexteritytextindexer", - "collective.dms.basecontent", + "collective.dms.basecontent>1.99", "imio.helpers>=0.55", "plone.formwidget.datetime", - #'plone.app.relationfield', + # "plone.app.relationfield", "five.grok", ], extras_require={ diff --git a/src/collective/dms/mailcontent/vocabularies.py b/src/collective/dms/mailcontent/vocabularies.py index d2afa30..bcbc950 100644 --- a/src/collective/dms/mailcontent/vocabularies.py +++ b/src/collective/dms/mailcontent/vocabularies.py @@ -46,7 +46,10 @@ def __call__(self, context): else: title = u"{} (« {} »)".format(ftitle, obj.file.filename) # TODO Mark signed version - if getattr(brain, "signed", False): # from collective.dms.scanbehavior + document = obj.aq_parent + cat_elems = getattr(document, "categorized_elements", {}) # from collective.iconifiedcategory + signed = cat_elems.get(brain.UID, {}).get("signed", False) + if signed: typ = u"{} signed".format(brain.portal_type) else: typ = brain.portal_type @@ -80,7 +83,10 @@ def __call__(self, context): title = ftitle else: title = u"{} (« {} »)".format(ftitle, obj.file.filename) - if getattr(brain, "signed", False): # from collective.dms.scanbehavior + document = obj.aq_parent + cat_elems = getattr(document, "categorized_elements", {}) # from collective.iconifiedcategory + signed = cat_elems.get(brain.UID, {}).get("signed", False) + if signed: typ = u"{} signed".format(brain.portal_type) else: typ = brain.portal_type