From bd69d2342dfa6adb6c28afe0ebbff980531425d4 Mon Sep 17 00:00:00 2001
From: Chris Adam <chris.adam@imio.be>
Date: Fri, 5 Dec 2025 15:06:37 +0100
Subject: [PATCH 1/2] Removed 'to_sign' and 'signed' fields from the behavior

---
 CHANGES.rst                                          |  3 ++-
 .../dms/scanbehavior/behaviors/behaviors.py          | 12 ------------
 .../locales/collective.dms.scanbehavior.pot          |  8 --------
 .../fr/LC_MESSAGES/collective.dms.scanbehavior.po    |  8 --------
 .../dms/scanbehavior/profiles/default/catalog.xml    |  5 -----
 5 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b17a9a9..6325406 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,7 +5,8 @@ Changelog
 1.3.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Removed 'to_sign' and 'signed' fields from the behavior.
+  [chris-adam]
 
 
 1.3.1 (2024-03-01)
diff --git a/src/collective/dms/scanbehavior/behaviors/behaviors.py b/src/collective/dms/scanbehavior/behaviors/behaviors.py
index 2224a8f..bf5c32a 100755
--- a/src/collective/dms/scanbehavior/behaviors/behaviors.py
+++ b/src/collective/dms/scanbehavior/behaviors/behaviors.py
@@ -24,8 +24,6 @@ class IScanFields(model.Schema):
             "scan_date",
             "scan_user",
             "scanner",
-            "to_sign",
-            "signed",
         ),
     )
 
@@ -73,16 +71,6 @@ class IScanFields(model.Schema):
         required=False,
     )
 
-    to_sign = schema.Bool(
-        title=_(u"To sign?"),
-        default=False,
-    )
-
-    signed = schema.Bool(
-        title=_(u"Signed version"),
-        default=False,
-    )
-
 
 alsoProvides(IScanFields, IFormFieldProvider)
 
diff --git a/src/collective/dms/scanbehavior/locales/collective.dms.scanbehavior.pot b/src/collective/dms/scanbehavior/locales/collective.dms.scanbehavior.pot
index fc9dd9c..5a1a46e 100644
--- a/src/collective/dms/scanbehavior/locales/collective.dms.scanbehavior.pot
+++ b/src/collective/dms/scanbehavior/locales/collective.dms.scanbehavior.pot
@@ -33,18 +33,10 @@ msgstr ""
 msgid "Scan metadata"
 msgstr ""
 
-#: ../behaviors/behaviors.py:88
-msgid "Signed version"
-msgstr ""
-
 #: ../testing.zcml:16
 msgid "Steps to ease tests of collective.dms.scanbehavior"
 msgstr ""
 
-#: ../behaviors/behaviors.py:83
-msgid "To sign?"
-msgstr ""
-
 #: ../behaviors/behaviors.py:45
 msgid "Version"
 msgstr ""
diff --git a/src/collective/dms/scanbehavior/locales/fr/LC_MESSAGES/collective.dms.scanbehavior.po b/src/collective/dms/scanbehavior/locales/fr/LC_MESSAGES/collective.dms.scanbehavior.po
index 7f912bf..b0621d0 100644
--- a/src/collective/dms/scanbehavior/locales/fr/LC_MESSAGES/collective.dms.scanbehavior.po
+++ b/src/collective/dms/scanbehavior/locales/fr/LC_MESSAGES/collective.dms.scanbehavior.po
@@ -30,18 +30,10 @@ msgstr "Scan"
 msgid "Scan metadata"
 msgstr "Métadonnées de numérisation"
 
-#: ../behaviors/behaviors.py:88
-msgid "Signed version"
-msgstr "Version signée"
-
 #: ../testing.zcml:16
 msgid "Steps to ease tests of collective.dms.scanbehavior"
 msgstr ""
 
-#: ../behaviors/behaviors.py:83
-msgid "To sign?"
-msgstr "À signer?"
-
 #: ../behaviors/behaviors.py:45
 msgid "Version"
 msgstr "Version"
diff --git a/src/collective/dms/scanbehavior/profiles/default/catalog.xml b/src/collective/dms/scanbehavior/profiles/default/catalog.xml
index 6c12e26..5161fdc 100644
--- a/src/collective/dms/scanbehavior/profiles/default/catalog.xml
+++ b/src/collective/dms/scanbehavior/profiles/default/catalog.xml
@@ -4,9 +4,4 @@
         <indexed_attr value="scan_id"/>
     </index>
     <column value="scan_id"/>
-
-    <index name="signed" meta_type="BooleanIndex">
-        <indexed_attr value="signed"/>
-    </index>
-    <column value="signed"/>
 </object>

From 626f367ea04909d4a70e8b4d4d2f08a41d0ec521 Mon Sep 17 00:00:00 2001
From: Chris <chris.adam.contact@gmail.com>
Date: Thu, 11 Dec 2025 14:26:16 +0100
Subject: [PATCH 2/2] Added upgrade to remove 'signed' index

---
 src/collective/dms/scanbehavior/configure.zcml        |  8 ++++++++
 .../dms/scanbehavior/profiles/default/metadata.xml    |  2 +-
 src/collective/dms/scanbehavior/upgrades.py           | 11 +++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/collective/dms/scanbehavior/configure.zcml b/src/collective/dms/scanbehavior/configure.zcml
index c2f40fa..012d636 100644
--- a/src/collective/dms/scanbehavior/configure.zcml
+++ b/src/collective/dms/scanbehavior/configure.zcml
@@ -30,4 +30,12 @@
         handler=".upgrades.v2"
         profile="collective.dms.scanbehavior:default" />
 
+    <genericsetup:upgradeStep
+        title="Migration profile for collective.dms.scanbehavior to 3"
+        description="Upgrade from 2 to 3"
+        source="2"
+        destination="3"
+        handler=".upgrades.v3"
+        profile="collective.dms.scanbehavior:default" />
+
 </configure>
diff --git a/src/collective/dms/scanbehavior/profiles/default/metadata.xml b/src/collective/dms/scanbehavior/profiles/default/metadata.xml
index d02ea5c..a44cc34 100644
--- a/src/collective/dms/scanbehavior/profiles/default/metadata.xml
+++ b/src/collective/dms/scanbehavior/profiles/default/metadata.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>2</version>
+  <version>3</version>
 </metadata>
diff --git a/src/collective/dms/scanbehavior/upgrades.py b/src/collective/dms/scanbehavior/upgrades.py
index b8e0086..659093d 100644
--- a/src/collective/dms/scanbehavior/upgrades.py
+++ b/src/collective/dms/scanbehavior/upgrades.py
@@ -30,3 +30,14 @@ def v2(context):
         obj = brain.getObject()
         obj.reindexObject(idxs=["signed"])
     logger.info("%d objects were migrated" % nb)
+
+
+def v3(context):
+    catalog = api.portal.get_tool("portal_catalog")
+    registered_indexes = catalog.indexes()
+    index = "signed"
+    if index in registered_indexes:
+        catalog.delIndex(index)
+        logger.info('Removed index "%s"...' % index)
+    else:
+        logger.info('Trying to remove an unexisting index with name "%s"...' % index)