Moved our types_not_searched settings to the registry.

abstract-open-solutions · Sep 30, 2015 · 6b4256e · 6b4256e
1 parent 8f3e395
commit 6b4256e
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 27 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,7 +5,8 @@ Change History
 1.8.0b5 (unreleased)
 --------------------
 
-- Moved our default_page_types setting to the registry.
+- Moved our default_page_types and types_not_searched settings to the
+  registry.
   [maurits]
 
 - Get email settings from registry.  Fixes several Plone 5 errors.

diff --git a/Products/PloneFormGen/profiles/default/propertiestool.xml b/Products/PloneFormGen/profiles/default/propertiestool.xml
@@ -59,30 +59,5 @@
    <element value="FormFolder"/>
    <element value="FieldsetFolder"/>
   </property>
-  <property name="types_not_searched" type="lines" purge="False">
-   <element value="FormSelectionField"/>
-   <element value="FormMultiSelectionField"/>
-   <element value="FormLabelField"/>
-   <element value="FormDateField"/>
-   <element value="FormLinesField"/>
-   <element value="FormIntegerField"/>
-   <element value="FormBooleanField"/>
-   <element value="FormPasswordField"/>
-   <element value="FormFixedPointField"/>
-   <element value="FormStringField"/>
-   <element value="FormTextField"/>
-   <element value="FormRichTextField"/>
-   <element value="FormRichLabelField"/>
-   <element value="FormFileField"/>
-   <element value="FormLikertField"/>
-   <element value="FormSaveDataAdapter"/>
-   <element value="FormMailerAdapter"/>
-   <element value="FormCustomScriptAdapter"/>
-   <element value="FormThanksPage"/>
-   <element value="FieldsetFolder"/>
-   <element value="FormCaptchaField"/>
-   <element value="FieldsetStart"/>
-   <element value="FieldsetEnd"/>
-  </property>
  </object>
 </object>
diff --git a/Products/PloneFormGen/profiles/default/registry.xml b/Products/PloneFormGen/profiles/default/registry.xml
@@ -7,6 +7,35 @@
     </value>
   </record>
 
+  <record name="plone.types_not_searched">
+    <value purge="False">
+      <element>FormSelectionField</element>
+      <element>FormMultiSelectionField</element>
+      <element>FormLabelField</element>
+      <element>FormDateField</element>
+      <element>FormLinesField</element>
+      <element>FormIntegerField</element>
+      <element>FormBooleanField</element>
+      <element>FormPasswordField</element>
+      <element>FormFixedPointField</element>
+      <element>FormStringField</element>
+      <element>FormTextField</element>
+      <element>FormRichTextField</element>
+      <element>FormRichLabelField</element>
+      <element>FormFileField</element>
+      <element>FormLikertField</element>
+      <element>FormSaveDataAdapter</element>
+      <element>FormMailerAdapter</element>
+      <element>FormCustomScriptAdapter</element>
+      <element>FormThanksPage</element>
+      <element>FieldsetFolder</element>
+      <element>FormCaptchaField</element>
+      <element>FieldsetStart</element>
+      <element>FieldsetEnd</element>
+    </value>
+  </record>
+
+
     <records prefix="plone.resources/pfgquickedit"
              interface='Products.CMFPlone.interfaces.IResourceRegistry'>
         <value key="js">++plone++pfgquickedit/quickedit.js</value>

diff --git a/Products/PloneFormGen/tests/testSetup.py b/Products/PloneFormGen/tests/testSetup.py
@@ -124,7 +124,8 @@ def testPortalFactorySetup(self):
             self.failUnless(f in self.factory.getFactoryTypes())
 
     def testTypesNotSearched(self):
-        types_not_searched = self.properties.site_properties.getProperty('types_not_searched')
+        registry = getUtility(IRegistry)
+        types_not_searched = registry['plone.types_not_searched']
         for f in self.fieldTypes + self.adapterTypes + self.thanksTypes + self.fieldsetTypes:
             self.failUnless(f in types_not_searched)
 
@@ -179,10 +180,16 @@ def testModificationsToPropSheetNotOverwritten(self):
         self.assertEquals(newprop, self.properties.ploneformgen_properties.getProperty('mail_body_type'))
 
     def testModificationsToRegistryLinesNotPurged(self):
+        from plone.dexterity.fti import DexterityFTI
         registry = getUtility(IRegistry)
         settings = [
             'plone.default_page_types',
+            'plone.types_not_searched',
         ]
+        # We need to register portal_type foo, otherwise we will fail
+        # validation of the types_not_searched vocabulary.
+        fti = DexterityFTI('foo')
+        self.portal.portal_types._setObject('foo', fti)
 
         # add garbage prop element to each lines property
         for option in settings: