diff --git a/backend/news/+updateDisabletoClickableProfileLink.bugfix b/backend/news/+updateDisabletoClickableProfileLink.bugfix new file mode 100644 index 00000000..886f5788 --- /dev/null +++ b/backend/news/+updateDisabletoClickableProfileLink.bugfix @@ -0,0 +1 @@ +Use "clickable_profile_link' instead of 'disable_profile_link' @Tishasoumya-02 \ No newline at end of file diff --git a/backend/src/kitconcept/core/controlpanel/kitconcept.py b/backend/src/kitconcept/core/controlpanel/kitconcept.py index d76a1724..71075111 100644 --- a/backend/src/kitconcept/core/controlpanel/kitconcept.py +++ b/backend/src/kitconcept/core/controlpanel/kitconcept.py @@ -21,13 +21,13 @@ class IKitconceptSettings(Interface): required=False, ) - disable_profile_links = schema.Bool( - title=_("Non-clickable Profiles"), + clickable_profile_links = schema.Bool( + title=_("Clickable profiles"), description=_( - "Person profiles are not clickable in teasers, grids, listings, and search" + "Person profiles are clickable in teasers, grids, listings, and search" ), required=False, - default=False, + default=True, ) @@ -68,4 +68,4 @@ def __call__(self, data): IKitconceptSettings, prefix="kitconcept.core.settings" ) data["kitconcept.custom_css"] = settings.custom_css - data["kitconcept.disable_profile_links"] = settings.disable_profile_links + data["kitconcept.clickable_profile_links"] = settings.clickable_profile_links diff --git a/backend/src/kitconcept/core/profiles/base/metadata.xml b/backend/src/kitconcept/core/profiles/base/metadata.xml index 2c1f571a..742cff9a 100644 --- a/backend/src/kitconcept/core/profiles/base/metadata.xml +++ b/backend/src/kitconcept/core/profiles/base/metadata.xml @@ -1,4 +1,4 @@ - 20260701001 + 20260706001 diff --git a/backend/src/kitconcept/core/upgrades/configure.zcml b/backend/src/kitconcept/core/upgrades/configure.zcml index 0bdaa530..c32602b8 100644 --- a/backend/src/kitconcept/core/upgrades/configure.zcml +++ b/backend/src/kitconcept/core/upgrades/configure.zcml @@ -15,5 +15,6 @@ + diff --git a/backend/src/kitconcept/core/upgrades/v20260706001/__init__.py b/backend/src/kitconcept/core/upgrades/v20260706001/__init__.py new file mode 100644 index 00000000..0a45a545 --- /dev/null +++ b/backend/src/kitconcept/core/upgrades/v20260706001/__init__.py @@ -0,0 +1,20 @@ +from plone.registry.interfaces import IRegistry +from Products.GenericSetup.tool import SetupTool +from zope.component import getUtility + + +def rename_disable_to_clickable_profile_links(tool: SetupTool): + """Migrate disable_profile_links to clickable_profile_links. + + The old ``disable_profile_links`` flag was inverted and renamed to + ``clickable_profile_links``, so carry the previous value over with the + opposite meaning and drop the stale record. + """ + old_key = "kitconcept.core.settings.disable_profile_links" + new_key = "kitconcept.core.settings.clickable_profile_links" + registry = getUtility(IRegistry) + records = registry.records + if old_key in records: + disabled = registry[old_key] + registry[new_key] = not disabled + del records[old_key] diff --git a/backend/src/kitconcept/core/upgrades/v20260706001/configure.zcml b/backend/src/kitconcept/core/upgrades/v20260706001/configure.zcml new file mode 100644 index 00000000..9b0c3e41 --- /dev/null +++ b/backend/src/kitconcept/core/upgrades/v20260706001/configure.zcml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py index f28bdcc1..6877a7ff 100644 --- a/backend/tests/conftest.py +++ b/backend/tests/conftest.py @@ -70,7 +70,7 @@ def current_versions() -> CurrentVersions: from kitconcept.core import __version__ return CurrentVersions( - base="20260701001", + base="20260706001", dependencies="1000", package=__version__, ) diff --git a/docs/docs/concepts/what-is-core.md b/docs/docs/concepts/what-is-core.md index 72a19dfb..56280720 100644 --- a/docs/docs/concepts/what-is-core.md +++ b/docs/docs/concepts/what-is-core.md @@ -110,7 +110,7 @@ After bumping the version of `kitconcept.core:base`, we need to create a new upg handler="..utils.null_upgrade_step" /> diff --git a/docs/docs/how-to-guides/upgrade-plone.md b/docs/docs/how-to-guides/upgrade-plone.md index 48ae0733..89be4cc7 100644 --- a/docs/docs/how-to-guides/upgrade-plone.md +++ b/docs/docs/how-to-guides/upgrade-plone.md @@ -49,7 +49,7 @@ Make a quick search for `plone_version` in the `backend/tests` folder and update /> diff --git a/frontend/packages/kitconcept-core/news/+fixToast_i_icon.bugfix b/frontend/packages/kitconcept-core/news/+fixToast_i_icon.bugfix new file mode 100644 index 00000000..f8c0fabf --- /dev/null +++ b/frontend/packages/kitconcept-core/news/+fixToast_i_icon.bugfix @@ -0,0 +1 @@ +Fix the size of i icon in toast @Tishasoumya-02 \ No newline at end of file diff --git a/frontend/packages/kitconcept-core/src/theme/components/returnToOriginal.scss b/frontend/packages/kitconcept-core/src/theme/components/returnToOriginal.scss index 4d52d401..c369fd1c 100644 --- a/frontend/packages/kitconcept-core/src/theme/components/returnToOriginal.scss +++ b/frontend/packages/kitconcept-core/src/theme/components/returnToOriginal.scss @@ -1,6 +1,11 @@ -.Toastify__toast.Toastify__toast--info.return-to-origin-toast +.Toastify__toast.Toastify__toast--info.return-to-origin-toast { .toast-box-center { - padding-top: 20px; + padding-top: 20px; + } + + .Toastify__toast-body svg.icon { + height: 28px !important; + } } .return.toast-box { diff --git a/news/+clickableProfileLink.documentation b/news/+clickableProfileLink.documentation new file mode 100644 index 00000000..56bae147 --- /dev/null +++ b/news/+clickableProfileLink.documentation @@ -0,0 +1 @@ +Update docs for clickable profile link control panel setting @Tishasoumya-02