diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 1f23a98..66a68a5 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -59,8 +59,7 @@ jobs: # compare the current branch with the base branch. # Source: https://github.com/actions/checkout/#fetch-all-branches. git fetch --no-tags origin ${BASE_BRANCH} - cd packages/${ADDON_NAME} - towncrier check --compare-with origin/${BASE_BRANCH} + towncrier check --dir packages/${ADDON_NAME} env: BASE_BRANCH: ${{ github.base_ref }} if: github.event_name == 'pull_request' diff --git a/packages/volto-social-blocks/news/30.bugfix b/packages/volto-social-blocks/news/30.bugfix new file mode 100644 index 0000000..b7adc96 --- /dev/null +++ b/packages/volto-social-blocks/news/30.bugfix @@ -0,0 +1 @@ +Fix registering of social blocks into volto-accordion [@ericof] \ No newline at end of file diff --git a/packages/volto-social-blocks/src/index.js b/packages/volto-social-blocks/src/index.js index acb88a8..1b6847b 100644 --- a/packages/volto-social-blocks/src/index.js +++ b/packages/volto-social-blocks/src/index.js @@ -110,7 +110,7 @@ const applyConfig = (config) => { // the internal `blocksConfig` object, so we clone the object to avoid this. ['__grid', 'gridBlock', 'accordion'].forEach((blockId) => { const block = config.blocks.blocksConfig[blockId]; - if (block !== undefined) { + if (block !== undefined && blocks.allowedBlocks !== undefined) { const localBlocks = [ 'facebookBlock', 'flickr',