Merge pull request #2 from collective/SE-227/remove_sign_scanbehavior

Removed 'to_sign' and 'signed' fields from the behavior

Author: sgeulette

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)

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)
 

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>

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 ""

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"

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>

src/collective/dms/scanbehavior/profiles/default/metadata.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>2</version>
+  <version>3</version>
 </metadata>

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)