imio.smartweb.core 1.2.51__py3-none-any.whl → 1.2.53__py3-none-any.whl

imio/smartweb/core/browser/vocabulary.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from plone.app.content.browser.vocabulary import VocabularyView
+
+from imio.smartweb.common.browser.vocabulary import TranslatedVocabularyView
 from plone.app.content.browser.vocabulary import VocabLookupException
 from plone.app.content.utils import json_dumps
 
 
-class SmartwebVocabularyView(VocabularyView):
+class SmartwebVocabularyView(TranslatedVocabularyView):
 
     def __call__(self):
         form = self.request.form

imio/smartweb/core/contents/sections/contact/content.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
 from imio.smartweb.core.contents.sections.base import ISection
 from imio.smartweb.core.contents.sections.base import Section
 from imio.smartweb.locales import SmartwebMessageFactory as _
-from plone.app.z3cform.widget import AjaxSelectFieldWidget
 from plone.autoform import directives
 from plone.supermodel import model
 from z3c.form.browser.checkbox import CheckBoxFieldWidget
@@ -16,7 +16,7 @@ class ISectionContact(ISection):
 
     directives.widget(
         "related_contacts",
-        AjaxSelectFieldWidget,
+        TranslatedAjaxSelectWidget,
         vocabulary="imio.smartweb.vocabulary.RemoteContacts",
         pattern_options={"multiple": True},
     )

imio/smartweb/core/contents/sections/events/content.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
 from imio.smartweb.core.contents.sections.base import ISection
 from imio.smartweb.core.contents.sections.base import Section
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone.app.z3cform.widget import RelatedItemsFieldWidget
-from plone.app.z3cform.widget import AjaxSelectFieldWidget
 from plone.app.z3cform.widget import SelectFieldWidget
 from plone.autoform import directives
 from plone.supermodel import model
@@ -13,8 +13,8 @@ from zope import schema
 from zope.globalrequest import getRequest
 from zope.i18n import translate
 from zope.interface import implementer
-from zope.schema.interfaces import IContextAwareDefaultFactory
 from zope.interface import provider
+from zope.schema.interfaces import IContextAwareDefaultFactory
 
 
 @provider(IContextAwareDefaultFactory)
@@ -40,7 +40,7 @@ class ISectionEvents(ISection):
     )
     directives.widget(
         "specific_related_events",
-        AjaxSelectFieldWidget,
+        TranslatedAjaxSelectWidget,
         source="imio.smartweb.vocabulary.EventsFromEntity",
     )
 

imio/smartweb/core/contents/sections/news/content.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.widgets.select import TranslatedAjaxSelectWidget
 from imio.smartweb.core.contents.sections.base import ISection
 from imio.smartweb.core.contents.sections.base import Section
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone.app.z3cform.widget import RelatedItemsFieldWidget
-from plone.app.z3cform.widget import AjaxSelectFieldWidget
 from plone.app.z3cform.widget import SelectFieldWidget
 from plone.autoform import directives
 from plone.supermodel import model
@@ -40,7 +40,7 @@ class ISectionNews(ISection):
     )
     directives.widget(
         "specific_related_newsitems",
-        AjaxSelectFieldWidget,
+        TranslatedAjaxSelectWidget,
         source="imio.smartweb.vocabulary.NewsItemsFromEntity",
     )
 

imio/smartweb/core/tests/test_vocabulary.py

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+
+from imio.smartweb.core.testing import IMIO_SMARTWEB_CORE_INTEGRATION_TESTING
+from imio.smartweb.core.testing import ImioSmartwebTestCase
+from plone import api
+from plone.app.testing import setRoles
+from plone.app.testing import TEST_USER_ID
+from unittest.mock import patch
+from zope.component import queryMultiAdapter
+
+import json
+
+
+class TestVocabulary(ImioSmartwebTestCase):
+    layer = IMIO_SMARTWEB_CORE_INTEGRATION_TESTING
+
+    def setUp(self):
+        """Custom shared utility setup for tests"""
+        self.request = self.layer["request"]
+        self.portal = self.layer["portal"]
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+        self.page = api.content.create(
+            container=self.portal,
+            type="imio.smartweb.Page",
+            title="My Page",
+        )
+
+    def test_getvocabulary(self):
+        self.request.form = {
+            "name": "imio.smartweb.vocabulary.Topics",
+            "field": "topics",
+        }
+        view = queryMultiAdapter((self.page, self.request), name="getVocabulary")
+        result = json.loads(view())
+        self.assertEqual(result["results"][0]["id"], "entertainment")
+        self.assertEqual(result["results"][0]["text"], "Entertainment")
+        with patch("plone.api.portal.get_current_language", return_value="fr"):
+            view = queryMultiAdapter((self.page, self.request), name="getVocabulary")
+            result = json.loads(view())
+            self.assertEqual(result["results"][0]["id"], "entertainment")
+            self.assertEqual(
+                result["results"][0]["text"], "Activités et divertissement"
+            )

{imio.smartweb.core-1.2.51.dist-info → imio.smartweb.core-1.2.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.51
+Version: 1.2.53
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -189,6 +189,21 @@ Changelog
 =========
 
 
+1.2.53 (2024-06-06)
+-------------------
+
+- WEB-4113 : Use `TranslatedAjaxSelectWidget` to fix select2 values translation
+  [laulaz]
+
+
+1.2.52 (2024-06-06)
+-------------------
+
+- WEB-4113 : Inherit `getVocabulary` from `imio.smartweb.common` view to handle
+  vocabularies translations correctly
+  [laulaz]
+
+
 1.2.51 (2024-06-03)
 -------------------
 

{imio.smartweb.core-1.2.51.dist-info → imio.smartweb.core-1.2.53.dist-info}/RECORD

@@ -1,4 +1,4 @@
-imio.smartweb.core-1.2.51-py3.8-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
+imio.smartweb.core-1.2.53-py3.11-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
 imio/smartweb/core/__init__.py,sha256=iwhKnzeBJLKxpRVjvzwiRE63_zNpIBfaKLITauVph-0,24
 imio/smartweb/core/config.py,sha256=BUgfvh4hCaw0onCYAG4gQI1O4hZ-GzXWEltdHi4YLIs,337
 imio/smartweb/core/configure.zcml,sha256=PeC4rF--rF6MfVQ0NzggQrZWIl35oPtJdEhvQwGxhhI,1459
@@ -32,7 +32,7 @@ imio/smartweb/core/browser/layout.py,sha256=wvo_Q2dYg1Yd8wOdYSfPg29NPESy9ndAGl6z
 imio/smartweb/core/browser/redirect_to_main_react_view.py,sha256=vzJwAet0P2uoMhlOtNjMy02e4LQw9DsHb6mRgBXGOB8,1668
 imio/smartweb/core/browser/sitemap.py,sha256=voch7Bvchz3NTCm9zUC75sShCLD4KunLKyWA6OtaGmE,5962
 imio/smartweb/core/browser/utils.py,sha256=ccA2DVA994S3t92_fQeMSFIGfAblE9C1vw78ZFUAJiU,3218
-imio/smartweb/core/browser/vocabulary.py,sha256=CHQeWZwvjDeoPLZS6C89ucfGGGnxBbAYpVu31_n7TSA,1142
+imio/smartweb/core/browser/vocabulary.py,sha256=VItGfYrv9NSHiUpEhnLkY4SpW8N2X91BX6A8UtsC8cA,1166
 imio/smartweb/core/browser/banner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/core/browser/banner/configure.zcml,sha256=Z2M7gkRDdmV4zRekUhyuJ-_jvbIbhgTj2Zq674iKvUE,389
 imio/smartweb/core/browser/banner/settings.py,sha256=jfD705_q8MAHUJbjjcfcPj1f98Rahiz_Mks2Ctx5kMA,947
@@ -232,7 +232,7 @@ imio/smartweb/core/contents/sections/common_templates/carousel.pt,sha256=vcRaxpk
 imio/smartweb/core/contents/sections/common_templates/table.pt,sha256=xr7HPyKP61RF75YnFUKPi_FudwVt_BJn3BzxXglQm3c,6769
 imio/smartweb/core/contents/sections/contact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/core/contents/sections/contact/configure.zcml,sha256=WjyGXO7alNf4yDW5dZCS_xQ_AYbQVQuRVRIeoyLIBzY,1591
-imio/smartweb/core/contents/sections/contact/content.py,sha256=SSeWBuqs1iDIhaGODI_gCsw4Q6ANBq6m7exZv1lPl_k,2669
+imio/smartweb/core/contents/sections/contact/content.py,sha256=MdhY6QPMdCseThddjwZ0e7xzkx1-p21MBuwqEic1f90,2690
 imio/smartweb/core/contents/sections/contact/forms.py,sha256=VlN_jse8tYxE9RCro2RgHlZRDDIyZA8Bjr-dNePZYwU,1387
 imio/smartweb/core/contents/sections/contact/macros.pt,sha256=ynqVHvtvvcNyAIGj5K07SO9jyRN0R3KbFBBn4t1qMaE,9523
 imio/smartweb/core/contents/sections/contact/utils.py,sha256=OsrEgrf0DuCHa_RlEP4gwHxSzOGqBMDZMDViO19w-Lc,5129
@@ -240,7 +240,7 @@ imio/smartweb/core/contents/sections/contact/view.pt,sha256=CyNoSxzf9kNQdjN2iCp7
 imio/smartweb/core/contents/sections/contact/view.py,sha256=5l5FQLxz-UfFZrttqNsWetuCg-4yT-wIzukIK-QLF6s,1422
 imio/smartweb/core/contents/sections/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/core/contents/sections/events/configure.zcml,sha256=FCDIf6w-2qCPqq0QUodw8-xyAopq7l6O8zoU_uMHNwg,1117
-imio/smartweb/core/contents/sections/events/content.py,sha256=i7OBUYmSrEQUBbnPK187l7cdygKGoiCgXN1WK7AYeHo,3177
+imio/smartweb/core/contents/sections/events/content.py,sha256=lfu_o-jyDIxNAfmC0GTWubVl7tHVfCmGICiKD8vtZJg,3198
 imio/smartweb/core/contents/sections/events/macros.pt,sha256=llSq-xstFiOXctseKDwvhVCM7A1_Z1Jq-_cUgNiBe10,1522
 imio/smartweb/core/contents/sections/events/view.py,sha256=Ylp23caV6ba8y0jjoradXsRnueIABPD4cC7A2maR97c,4528
 imio/smartweb/core/contents/sections/external_content/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -276,7 +276,7 @@ imio/smartweb/core/contents/sections/map/view.pt,sha256=tEEL2ht3KYKJC87_SaT25Ij6
 imio/smartweb/core/contents/sections/map/views.py,sha256=3Z5oFis2NIByJCHh8bjAlLutc4Wp8j6rY6bkvShxEm8,614
 imio/smartweb/core/contents/sections/news/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/core/contents/sections/news/configure.zcml,sha256=8MOIEeI7Zr_wbNVgiMa_21Ohgv_bkpEi_7gJu6NK380,880
-imio/smartweb/core/contents/sections/news/content.py,sha256=xqVlWUD4aX4CPLX72ilKaBW65XrE37dZqCtq4p2rZwQ,3192
+imio/smartweb/core/contents/sections/news/content.py,sha256=3zI0rjAOLhK8HmBN4kRRP3kBRfdFrwCFQVbm4RnA9bs,3213
 imio/smartweb/core/contents/sections/news/view.py,sha256=e3gwMlyxevvqHJ1CxSMQ8W_q8KECpB8F5inwbofzhQg,4155
 imio/smartweb/core/contents/sections/postit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/core/contents/sections/postit/configure.zcml,sha256=Q0Szs1pmrNP2OiRROpeSQPKLV3tCpyjqZa9vwNFTK9Q,504
@@ -419,6 +419,7 @@ imio/smartweb/core/tests/test_text.py,sha256=DtZNNGJ-MDYbJ-YQj2C0q2Hr7t4-sUbV6SW
 imio/smartweb/core/tests/test_toolbar.py,sha256=dxwOGNOg2wPkAnPU3hqGCI6VL2D2nPOIOtbMorvjfps,3823
 imio/smartweb/core/tests/test_utils.py,sha256=CkRkK3SbT4oQx_-Nq2Z0AhmhzR4kk2BkIZqSbIiPU04,4125
 imio/smartweb/core/tests/test_vocabularies.py,sha256=5DRfIlpOpXauXCgNN3UAUJJh246naykErGNBcYfYx0M,14368
+imio/smartweb/core/tests/test_vocabulary.py,sha256=9S3BtVIJbN1o0q2qMcX8k0CdUwixmc3DBs_s5qFrJwA,1648
 imio/smartweb/core/tests/utils.py,sha256=hsDrWOxL0oNNyx92Hke9Kj9ByKzc2kZ19q9QPVsNud4,2688
 imio/smartweb/core/tests/resources/cirkwi_bad_widget_mock.html,sha256=13YeZ0mo8PoeHIHa64SLKuhNfGqBMT2uprmYDyQxE78,150
 imio/smartweb/core/tests/resources/cirkwi_good_widget_mock.html,sha256=vBgQwBKNGcGRrOHfXYZO_gmAGL1oKPDIUOnDfXEHCR4,333252
@@ -722,10 +723,10 @@ imio/smartweb/core/webcomponents/src/utils/Map.jsx,sha256=cYuZykMIaLjr4KiLvmS4aY
 imio/smartweb/core/webcomponents/src/utils/Map.scss,sha256=xXWz0O-JBwSZrzz2XeQdN4nZEOjppU2sVFtlLQOitQ8,77
 imio/smartweb/core/webcomponents/src/utils/translation.js,sha256=5YDHwdaRNWFWOgyNd7YejoAdcDvnvAENo3Xn0GDT8P8,8941
 imio/smartweb/core/webcomponents/src/utils/url.js,sha256=iyl_1QXfPBgUn0LEbZYT_zMEEjmj5DMiEz44Z6AKLcg,244
-imio.smartweb.core-1.2.51.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio.smartweb.core-1.2.51.dist-info/LICENSE.rst,sha256=RzkMFz6AX3-cHd531zd2YQcXai8RIbjFWTs6m66Y5u4,653
-imio.smartweb.core-1.2.51.dist-info/METADATA,sha256=eSKrKbHkoP4XbSyx98ENxoDizrNrnJk9yjjJi2NzD4w,53609
-imio.smartweb.core-1.2.51.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-imio.smartweb.core-1.2.51.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio.smartweb.core-1.2.51.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio.smartweb.core-1.2.51.dist-info/RECORD,,
+imio.smartweb.core-1.2.53.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio.smartweb.core-1.2.53.dist-info/LICENSE.rst,sha256=RzkMFz6AX3-cHd531zd2YQcXai8RIbjFWTs6m66Y5u4,653
+imio.smartweb.core-1.2.53.dist-info/METADATA,sha256=cNSp1IiYz5sLOMphox2md2nn5tzGzqNCr_ycL96rSUw,53915
+imio.smartweb.core-1.2.53.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+imio.smartweb.core-1.2.53.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio.smartweb.core-1.2.53.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio.smartweb.core-1.2.53.dist-info/RECORD,,