Skip to content

Commit f7f66df

Browse files
authored
Merge pull request #5 from collective/SE-227/remove_sign_scanbehavior
Removed 'to_sign' and 'signed' fields from the scanbehavior
2 parents 29cde38 + 68f9994 commit f7f66df

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

CHANGES.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ Changelog
44
1.16.5 (unreleased)
55
-------------------
66

7-
- Nothing changed yet.
7+
- Removed 'to_sign' and 'signed' fields from scanbehavior.
8+
[chris-adam]
89

910

1011
1.16.4 (2025-06-24)

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
"plone.directives.form",
4949
"collective.contact.core",
5050
"collective.dexteritytextindexer",
51-
"collective.dms.basecontent",
51+
"collective.dms.basecontent>1.99",
5252
"imio.helpers>=0.55",
5353
"plone.formwidget.datetime",
54-
#'plone.app.relationfield',
54+
# "plone.app.relationfield",
5555
"five.grok",
5656
],
5757
extras_require={

src/collective/dms/mailcontent/vocabularies.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ def __call__(self, context):
4646
else:
4747
title = u"{} (« {} »)".format(ftitle, obj.file.filename)
4848
# TODO Mark signed version
49-
if getattr(brain, "signed", False): # from collective.dms.scanbehavior
49+
document = obj.aq_parent
50+
cat_elems = getattr(document, "categorized_elements", {}) # from collective.iconifiedcategory
51+
signed = cat_elems.get(brain.UID, {}).get("signed", False)
52+
if signed:
5053
typ = u"{} signed".format(brain.portal_type)
5154
else:
5255
typ = brain.portal_type
@@ -80,7 +83,10 @@ def __call__(self, context):
8083
title = ftitle
8184
else:
8285
title = u"{} (« {} »)".format(ftitle, obj.file.filename)
83-
if getattr(brain, "signed", False): # from collective.dms.scanbehavior
86+
document = obj.aq_parent
87+
cat_elems = getattr(document, "categorized_elements", {}) # from collective.iconifiedcategory
88+
signed = cat_elems.get(brain.UID, {}).get("signed", False)
89+
if signed:
8490
typ = u"{} signed".format(brain.portal_type)
8591
else:
8692
typ = brain.portal_type

0 commit comments

Comments
 (0)