Merge pull request #13 from collective/fix-form-integration

fix: form integration
collective · May 15, 2024 · 45770f8 · 45770f8
2 parents 685a4af + 8bb82b4
commit 45770f8
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/backend/instance.yaml b/backend/instance.yaml
@@ -3,6 +3,6 @@ default_context:
     initial_user_password: 'admin'
 
     load_zcml:
-        package_includes: ['plone.edu', 'collective.volto.formsupport']
+        package_includes: ['plone.edu']
 
     db_storage: direct
diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -1,3 +1,2 @@
 -c constraints.txt
 -e ".[test]"
-collective.volto.formsupport
diff --git a/backend/setup.py b/backend/setup.py
@@ -62,6 +62,8 @@
         "plone.dexterity",
         "plone.supermodel",
         "zope.interface",
+        "collective.volto.formsupport",
+        "collective.z3cform.norobots",
     ],
     extras_require={
         "test": [

diff --git a/backend/src/plone/edu/dependencies.zcml b/backend/src/plone/edu/dependencies.zcml
@@ -6,5 +6,7 @@
   <include package="collective.person" />
   <include package="plone.distribution" />
   <include package="plone.edu" />
+  <include package="collective.volto.formsupport" />
+  <include package="collective.z3cform.norobots" />
 
 </configure>
diff --git a/backend/src/plone/edu/distributions/edu/profiles.json b/backend/src/plone/edu/distributions/edu/profiles.json
@@ -8,6 +8,7 @@
     "collective.person:default",
     "plonetheme.barceloneta:default",
     "collective.volto.formsupport:default",
+    "collective.z3cform.norobots:default",
     "plone.edu:default"
   ],
   "content": []

diff --git a/frontend/package.json b/frontend/package.json
@@ -158,8 +158,8 @@
     "@kitconcept/volto-separator-block": "^4.0.0",
     "@kitconcept/volto-slider-block": "^6.0.0",
     "@plone/volto": "18.0.0-alpha.18",
-    "volto-form-block": "3.8.2",
-    "volto-subblocks": "2.0.0"
+    "volto-form-block": "^3.8.2",
+    "volto-subblocks": "^2.0.0"
   },
   "devDependencies": {
     "@plone/scripts": "^3.0.0",

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -13346,8 +13346,8 @@ __metadata:
     ts-jest: ^26.4.2
     ts-loader: 9.4.4
     typescript: 5.2.2
-    volto-form-block: 3.8.2
-    volto-subblocks: 2.0.0
+    volto-form-block: ^3.8.2
+    volto-subblocks: ^2.0.0
   languageName: unknown
   linkType: soft
 
@@ -26644,7 +26644,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"volto-form-block@npm:3.8.2":
+"volto-form-block@npm:^3.8.2":
   version: 3.8.2
   resolution: "volto-form-block@npm:3.8.2"
   dependencies:
@@ -26690,7 +26690,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"volto-subblocks@npm:2.0.0, volto-subblocks@npm:^2.0.0":
+"volto-subblocks@npm:^2.0.0":
   version: 2.0.0
   resolution: "volto-subblocks@npm:2.0.0"
   dependencies: