From b4f875c21f1aa048af35e2ecbcd5b6bd01cf118a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Fri, 29 Oct 2021 13:36:22 +0200 Subject: [PATCH 1/5] Fix privacy dropdown behavior --- .../components/modals/publish/create-privacy-options.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js b/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js index a3a917371e..6cde035a2a 100755 --- a/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js +++ b/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js @@ -57,8 +57,8 @@ module.exports = function (visDefinitionModel, userModel) { var publicMustBeDisabled = (option.privacy !== 'PRIVATE' && publicSharingIsDisabled); - var enabled = (option.alwaysEnabled || premiumEnabled) && !publicMustBeDisabled; - + var enabled = ((option.alwaysEnabled || premiumEnabled) && !publicMustBeDisabled) || option.privacy === 'PRIVATE'; + return _.defaults({ selected: option.privacy === currentPrivacy, disabled: !enabled From 9c9f2d98f47d20d48e6a2dbd5dedf43169fec9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Fri, 29 Oct 2021 13:40:08 +0200 Subject: [PATCH 2/5] Update NEWS.md --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index ec18519ca2..ce3dbc78fa 100644 --- a/NEWS.md +++ b/NEWS.md @@ -70,6 +70,7 @@ Development - Fix Auth URL generation while establishing a connection with Google Drive [#16357](https://github.com/CartoDB/cartodb/pull/16357) - Fix adding license metadata to a dataset [#16356](https://github.com/CartoDB/cartodb/pull/16356) - Fix notifications when organization seats limit is reached [#16359](https://github.com/CartoDB/cartodb/pull/16359) +- Fix privacy dropdown when editing a map [#16367](https://github.com/CartoDB/cartodb/pull/16367) 4.45.0 (2021-04-14) ------------------- From 79d6112505ecf83d4f45fe7f3fe15ccf28482756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Fri, 29 Oct 2021 13:41:18 +0200 Subject: [PATCH 3/5] Remove spaces --- .../builder/components/modals/publish/create-privacy-options.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js b/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js index 6cde035a2a..e788a2e225 100755 --- a/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js +++ b/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js @@ -58,7 +58,6 @@ module.exports = function (visDefinitionModel, userModel) { var publicMustBeDisabled = (option.privacy !== 'PRIVATE' && publicSharingIsDisabled); var enabled = ((option.alwaysEnabled || premiumEnabled) && !publicMustBeDisabled) || option.privacy === 'PRIVATE'; - return _.defaults({ selected: option.privacy === currentPrivacy, disabled: !enabled From af5f2cc1d19b899bb214ee35b4ec678c3d8a8760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Fri, 29 Oct 2021 13:43:12 +0200 Subject: [PATCH 4/5] Remove spaces --- .../builder/components/modals/publish/create-privacy-options.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js b/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js index 6cde035a2a..e788a2e225 100755 --- a/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js +++ b/lib/assets/javascripts/builder/components/modals/publish/create-privacy-options.js @@ -58,7 +58,6 @@ module.exports = function (visDefinitionModel, userModel) { var publicMustBeDisabled = (option.privacy !== 'PRIVATE' && publicSharingIsDisabled); var enabled = ((option.alwaysEnabled || premiumEnabled) && !publicMustBeDisabled) || option.privacy === 'PRIVATE'; - return _.defaults({ selected: option.privacy === currentPrivacy, disabled: !enabled From c8136eefcc201ce40372f4aaf6a94c8bb98989db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Fri, 29 Oct 2021 13:43:44 +0200 Subject: [PATCH 5/5] Update assets version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce7dab7884..222aa32345 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.270", + "version": "1.0.0-assets.275", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 1370399394..5877ed2cb3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cartodb-ui", - "version": "1.0.0-assets.271", + "version": "1.0.0-assets.275", "description": "CARTO UI frontend", "repository": { "type": "git",