Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
pnicolli committed Sep 4, 2023
2 parents 79dafc6 + ce80334 commit 7206c9a
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 4 deletions.
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,26 @@


## [8.4.6](https://github.com/redturtle/design-comuni-plone-theme/compare/v8.4.5...v8.4.6) (2023-08-31)


### Bug Fixes

* changed conditions for campo importi in CT persona ([65931ac](https://github.com/redturtle/design-comuni-plone-theme/commit/65931acb8d1d8a6e12444067573380b639f03291))

## [8.4.5](https://github.com/redturtle/design-comuni-plone-theme/compare/v8.4.4...v8.4.5) (2023-08-30)


### Bug Fixes

* changed conditions for campo compensi in CT persona ([8b2c7c0](https://github.com/redturtle/design-comuni-plone-theme/commit/8b2c7c0ea2e2a8539c3e8ca16077d74539bc6f5d))

## [8.4.4](https://github.com/redturtle/design-comuni-plone-theme/compare/v8.4.3...v8.4.4) (2023-08-30)


### Bug Fixes

* removed link from last breadcrumb element ([a10237b](https://github.com/redturtle/design-comuni-plone-theme/commit/a10237bf697f84d12c0a95045f7203278e3cb42e))

## [8.4.3](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v8.4.2...v8.4.3) (2023-08-25)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "design-comuni-plone-theme",
"description": "Volto Theme for Italia design guidelines",
"license": "GPL-v3",
"version": "8.4.3",
"version": "8.4.6",
"main": "src/index.js",
"keywords": [
"volto-addon",
Expand Down
5 changes: 4 additions & 1 deletion src/components/ItaliaTheme/Breadcrumbs/Breadcrumbs.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ const Breadcrumbs = ({ pathname }) => {
</BreadcrumbItem>
{items.map((item, index, items) => (
<BreadcrumbItem tag="li" key={item.url}>
<UniversalLink href={item.url}>{item.title}</UniversalLink>
{index < items.length - 1 && (
<UniversalLink href={item.url}>{item.title}</UniversalLink>
)}
{index === items.length - 1 && <span>{item.title}</span>}
{index < items.length - 1 && (
<span className="separator">/</span>
)}
Expand Down
6 changes: 4 additions & 2 deletions src/components/ItaliaTheme/View/PersonaView/PersonaRuolo.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ const PersonaRuolo = ({ content }) => {
</RichTextSection>
)}

{richTextHasContent(content.incarichi_persona[0].compensi) && (
{(richTextHasContent(content.incarichi_persona[0].compensi) ||
content.incarichi_persona[0]?.compensi_file?.length > 0) && (
<RichTextSection
tag_id="compensi"
title={intl.formatMessage(messages.compensi)}
Expand Down Expand Up @@ -154,7 +155,8 @@ const PersonaRuolo = ({ content }) => {
)}
data={content.incarichi_persona[0].importi_di_viaggio_e_o_servizi}
>
{content.incarichi_persona[0]?.compensi_file?.length > 0 && (
{content.incarichi_persona[0]?.importi_di_viaggio_e_o_servizi
?.length > 0 && (
<div className="compensi-item mb-2">
<div className="card-wrapper card-teaser-wrapper card-teaser-wrapper-equal">
{content.incarichi_persona[0]?.importi_di_viaggio_e_o_servizi.map(
Expand Down

0 comments on commit 7206c9a

Please sign in to comment.