Skip to content

Commit

Permalink
Merge pull request #278 from eea/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
avoinea authored Dec 19, 2024
2 parents a9ab2e1 + 1e3b240 commit af0d5b4
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

### [3.5.1](https://github.com/eea/volto-eea-website-theme/compare/3.5.0...3.5.1) - 19 December 2024

#### :bug: Bug Fixes

- fix: download link when download is enabled on CTA block rfs#281622 [nileshgulia1 - [`1e111c7`](https://github.com/eea/volto-eea-website-theme/commit/1e111c77cd0b9ec8303d1571fafb6efab3f5e848)]

#### :house: Internal changes

- chore: package.json [Alin Voinea - [`1956de1`](https://github.com/eea/volto-eea-website-theme/commit/1956de189d6ef12a9117dca335c214131615e98d)]

#### :hammer_and_wrench: Others

- Update UniversalLink.jsx [Nilesh - [`1358d69`](https://github.com/eea/volto-eea-website-theme/commit/1358d6939493f48a26acb67fbdeacc98ade4c6d8)]
- fix only append @@download if internalUrl [nileshgulia1 - [`12e70bc`](https://github.com/eea/volto-eea-website-theme/commit/12e70bc79f7660589b1a84c933c56c6dac4e8da2)]
### [3.5.0](https://github.com/eea/volto-eea-website-theme/compare/3.4.0...3.5.0) - 16 December 2024

#### :rocket: New Features
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eeacms/volto-eea-website-theme",
"version": "3.5.0",
"version": "3.5.1",
"description": "@eeacms/volto-eea-website-theme: Volto add-on",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down Expand Up @@ -82,4 +82,4 @@
"cypress:open": "make cypress-open",
"prepare": "husky install"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ const UniversalLink = ({
}
}

if (download && isInternalURL(url)) {
url = url.includes('/@@download/file') ? url : `${url}/@@download/file`;
}

const isExternal = !isInternalURL(url);
const isDownload =
(!isExternal && url && url.includes('@@download')) || download;
Expand Down

0 comments on commit af0d5b4

Please sign in to comment.