Skip to content

Commit

Permalink
Merge pull request #13 from collective/fix-form-integration
Browse files Browse the repository at this point in the history
fix: form integration
  • Loading branch information
mbarde authored May 15, 2024
2 parents 685a4af + 8bb82b4 commit 45770f8
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion backend/instance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion backend/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
-c constraints.txt
-e ".[test]"
collective.volto.formsupport
2 changes: 2 additions & 0 deletions backend/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
"plone.dexterity",
"plone.supermodel",
"zope.interface",
"collective.volto.formsupport",
"collective.z3cform.norobots",
],
extras_require={
"test": [
Expand Down
2 changes: 2 additions & 0 deletions backend/src/plone/edu/dependencies.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 1 addition & 0 deletions backend/src/plone/edu/distributions/edu/profiles.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"collective.person:default",
"plonetheme.barceloneta:default",
"collective.volto.formsupport:default",
"collective.z3cform.norobots:default",
"plone.edu:default"
],
"content": []
Expand Down
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 45770f8

Please sign in to comment.