Merge branch 'global-forms' into deploy

Author: JeffersonBledsoe

src/collective/volto/formsupport/adapters/post.py

@@ -148,7 +148,7 @@ def get_block_data(self, block_id, global_form_id):
                 return {}
         for id, block in blocks.items():
             # Prefer local forms it they're available, fall back to global form
-            if id != block_id and id != global_form_id:
+            if id != block_id and id != global_form_id and block.get("global_form_id" != global_form_id):
                 continue
             block_type = block.get("@type", "")
             if block_type != "form":

src/collective/volto/formsupport/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>1301</version>
+  <version>1302</version>
   <dependencies>
     <dependency>profile-collective.volto.otp:default</dependency>
   </dependencies>

src/collective/volto/formsupport/upgrades.zcml

@@ -40,4 +40,12 @@
       handler=".upgrades.to_1301"
       />
 
+  <genericsetup:upgradeDepends
+      title="Add global form registry entry"
+      profile="collective.volto.formsupport:default"
+      source="1301"
+      destination="1302"
+      import_steps="plone.app.registry"
+      />
+
 </configure>