From 8bb82b47940dfb1cd699b0e30091d138822043f7 Mon Sep 17 00:00:00 2001 From: Matthias Barde Date: Wed, 15 May 2024 11:04:25 +0200 Subject: [PATCH] fix: form integration --- backend/instance.yaml | 2 +- backend/requirements.txt | 1 - backend/setup.py | 2 ++ backend/src/plone/edu/dependencies.zcml | 2 ++ backend/src/plone/edu/distributions/edu/profiles.json | 1 + frontend/package.json | 4 ++-- frontend/yarn.lock | 8 ++++---- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/backend/instance.yaml b/backend/instance.yaml index 40b2447..e2961e0 100644 --- 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 index ea0565d..9dd6dd4 100644 --- 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 index 8582b4d..97f7626 100644 --- 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 index f04e321..ed306d5 100644 --- a/backend/src/plone/edu/dependencies.zcml +++ b/backend/src/plone/edu/dependencies.zcml @@ -6,5 +6,7 @@ + + diff --git a/backend/src/plone/edu/distributions/edu/profiles.json b/backend/src/plone/edu/distributions/edu/profiles.json index d537ffb..df0d49d 100644 --- 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 index f65a21a..e5df0e2 100644 --- 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 index 03b8daf..8c97a6c 100644 --- 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: