imio.smartweb.core 1.2.43__py3-none-any.whl → 1.2.45__py3-none-any.whl

imio/smartweb/core/tests/test_section_news.py

@@ -115,9 +115,6 @@ class TestSectionNews(ImioSmartwebTestCase):
         intids = getUtility(IIntIds)
         self.news.related_news = "64f4cbee9a394a018a951f6d94452914"
         self.news.linking_rest_view = RelationValue(intids.getId(self.rest_news_view))
-        annotations = IAnnotations(self.news)
-        self.assertIsNone(annotations.get(SECTION_ITEMS_HASH_KEY))
-
         news_view = queryMultiAdapter((self.news, self.request), name="carousel_view")
         url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
         m.get(url, text=json.dumps(self.json_news))
@@ -125,3 +122,19 @@ class TestSectionNews(ImioSmartwebTestCase):
         self.assertIn("paysage_vignette", news_view.items[0][0]["image"])
         self.news.orientation = "portrait"
         self.assertIn("portrait_vignette", news_view.items[0][0]["image"])
+
+    @requests_mock.Mocker()
+    def test_show_categories_or_topics(self, m):
+        intids = getUtility(IIntIds)
+        self.news.related_news = "64f4cbee9a394a018a951f6d94452914"
+        self.news.linking_rest_view = RelationValue(intids.getId(self.rest_news_view))
+        news_view = queryMultiAdapter((self.news, self.request), name="carousel_view")
+        url = "http://localhost:8080/Plone/@search?selected_news_folders=64f4cbee9a394a018a951f6d94452914&portal_type=imio.news.NewsItem&metadata_fields=category_title&metadata_fields=has_leadimage&metadata_fields=modified&metadata_fields=effective&metadata_fields=UID&sort_limit=6&translated_in_en=1&sort_on=effective&sort_order=descending"
+        m.get(url, text=json.dumps(self.json_news))
+        self.assertEqual(news_view.items[0][0]["category"], "Presse")
+        self.news.show_categories_or_topics = "category"
+        self.assertEqual(news_view.items[0][0]["category"], "Presse")
+        self.news.show_categories_or_topics = "topic"
+        self.assertEqual(news_view.items[0][0]["category"], "Education")
+        self.news.show_categories_or_topics = ""
+        self.assertEqual(news_view.items[0][0]["category"], "")

imio/smartweb/core/tests/test_vocabularies.py

@@ -81,6 +81,9 @@ class TestVocabularies(ImioSmartwebTestCase):
         m.get(GUICHET_URL, text=json.dumps(self.json_procedures_raw_mock))
         self.assertVocabularyLen("imio.smartweb.vocabulary.PublikProcedures", 0)
 
+    def test_categories_display(self):
+        self.assertVocabularyLen("imio.smartweb.vocabulary.CategoriesDisplay", 3)
+
     def test_bootstrap_css(self):
         self.assertVocabularyLen("imio.smartweb.vocabulary.BootstrapCSS", 6)
 

imio/smartweb/core/upgrades/configure.zcml

@@ -227,6 +227,14 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_1056_to_1057"
+      title="Upgrade core from 1056 to 1057"
+      directory="profiles/1056_to_1057"
+      description="Add imio.smartweb.category_display behavior on content types"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <genericsetup:upgradeStep
       title="Configure first official release"
       description="Run needed profiles steps and reindex catalog"
@@ -801,4 +809,14 @@
         />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      source="1056"
+      destination="1057"
+      profile="imio.smartweb.core:default">
+    <genericsetup:upgradeDepends
+        title="Add imio.smartweb.category_display behavior on content types"
+        import_profile="imio.smartweb.core.upgrades:upgrade_1056_to_1057"
+        />
+  </genericsetup:upgradeSteps>
+
 </configure>

imio/smartweb/core/upgrades/profiles/1056_to_1057/types/imio.smartweb.EventsView.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    name="imio.smartweb.EventsView"
+    meta_type="Dexterity FTI"
+    i18n:domain="imio.smartweb">
+
+  <property name="behaviors" purge="false">
+    <element value="imio.smartweb.category_display"/>
+  </property>
+
+</object>

imio/smartweb/core/upgrades/profiles/1056_to_1057/types/imio.smartweb.NewsView.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    name="imio.smartweb.NewsView"
+    meta_type="Dexterity FTI"
+    i18n:domain="imio.smartweb">
+
+  <property name="behaviors" purge="false">
+    <element value="imio.smartweb.category_display"/>
+  </property>
+
+</object>

imio/smartweb/core/upgrades/profiles/1056_to_1057/types/imio.smartweb.SectionEvents.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    name="imio.smartweb.SectionEvents"
+    meta_type="Dexterity FTI"
+    i18n:domain="imio.smartweb">
+
+  <property name="behaviors" purge="false">
+    <element value="imio.smartweb.category_display"/>
+  </property>
+
+</object>

imio/smartweb/core/upgrades/profiles/1056_to_1057/types/imio.smartweb.SectionNews.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    name="imio.smartweb.SectionNews"
+    meta_type="Dexterity FTI"
+    i18n:domain="imio.smartweb">
+
+  <property name="behaviors" purge="false">
+    <element value="imio.smartweb.category_display"/>
+  </property>
+
+</object>

imio/smartweb/core/utils.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from Acquisition import aq_inner
 from Acquisition import aq_parent
 from collective.taxonomy.interfaces import ITaxonomy
 from imio.smartweb.core.config import WCA_URL
@@ -14,7 +13,6 @@ from Products.CMFPlone.interfaces.siteroot import IPloneSiteRoot
 from Products.CMFPlone.utils import base_hasattr
 from zope.component import getSiteManager
 from zope.component import queryMultiAdapter
-from zope.globalrequest import getRequest
 
 import hashlib
 import json
@@ -198,24 +196,3 @@ def get_plausible_vars():
         return plausible_vars
     else:
         return None
-
-
-def get_current_language(context=None):
-    """Return the current negotiated language.
-
-    :param context: context object
-    :type context: object
-    :returns: language identifier
-    :rtype: string
-    :Example: :ref:`portal-get-current-language-example`
-    """
-    request = getRequest()
-    if request is None:
-        return (
-            context and aq_inner(context).Language()
-        ) or api.portal.get_default_language()
-    return (
-        request.get("LANGUAGE", None)
-        or (context and aq_inner(context).Language())
-        or api.portal.get_default_language()
-    )

imio/smartweb/core/vocabularies.py

@@ -118,6 +118,23 @@ class CurrentFolderPagesVocabularyFactory:
 CurrentFolderPagesVocabulary = CurrentFolderPagesVocabularyFactory()
 
 
+class CategoriesDisplayVocabularyFactory:
+    def __call__(self, context=None):
+        values = [
+            ("category", _("Category")),
+            ("topic", _("Topic")),
+            ("", _("None")),
+        ]
+        terms = [
+            SimpleVocabulary.createTerm(value[0], value[0], value[1])
+            for value in values
+        ]
+        return SimpleVocabulary(terms)
+
+
+CategoriesDisplayVocabulary = CategoriesDisplayVocabularyFactory()
+
+
 class BootstrapCSSVocabularyFactory:
     def __call__(self, context=None):
         bootstrap_css = [

imio/smartweb/core/vocabularies.zcml

@@ -19,6 +19,12 @@
       provides="zope.schema.interfaces.IVocabularyFactory"
       />
 
+  <utility
+      name="imio.smartweb.vocabulary.CategoriesDisplay"
+      component=".vocabularies.CategoriesDisplayVocabulary"
+      provides="zope.schema.interfaces.IVocabularyFactory"
+      />
+
   <utility
       name="imio.smartweb.vocabulary.BootstrapCSS"
       component=".vocabularies.BootstrapCSSVocabulary"

imio/smartweb/core/webcomponents/build/css/373.smartweb-webcomponents-compiled.css

@@ -1 +1 @@
-.flexbin{display:flex;flex-wrap:wrap;margin:-2.5px;overflow:hidden}.flexbin:after{content:"";flex-grow:999999999;height:0;min-width:300px}.flexbin>*{display:block;flex-grow:1;height:300px;margin:2.5px;position:relative}.flexbin>*>img{height:300px;max-width:100%;min-width:100%;object-fit:cover;vertical-align:bottom}.flexbin.flexbin-margin{margin:2.5px}@media (max-width:980px){.flexbin{display:flex;flex-wrap:wrap;margin:-2.5px;overflow:hidden}.flexbin:after{content:"";flex-grow:999999999;height:0;min-width:150px}.flexbin>*{display:block;flex-grow:1;height:150px;margin:2.5px;position:relative}.flexbin>*>img{height:150px;max-width:100%;min-width:100%;object-fit:cover;vertical-align:bottom}.flexbin.flexbin-margin{margin:2.5px}}@media (max-width:400px){.flexbin{display:flex;flex-wrap:wrap;margin:-2.5px;overflow:hidden}.flexbin:after{content:"";flex-grow:999999999;height:0;min-width:100px}.flexbin>*{display:block;flex-grow:1;height:100px;margin:2.5px;position:relative}.flexbin>*>img{height:100px;max-width:100%;min-width:100%;object-fit:cover;vertical-align:bottom}.flexbin.flexbin-margin{margin:2.5px}}.breadcrumb{padding:0}.r-result-list{list-style:none;margin-top:50px;padding-left:0}#portal-column-content h1{font-size:0;position:absolute}#viewlet-below-content-description,#viewlet-below-content-title{display:none}.r-item-text{display:flex;flex-direction:column;margin:20px 30px;position:relative}.r-item-title{display:block}.r-results-numbers{margin-bottom:.5rem;width:100%}.r-results-numbers span{font-weight:700}.r-content-img{padding-bottom:60%}.new-content{margin:0 auto;max-width:700px}.r-load-more{margin-bottom:2rem;text-align:center}.r-load-more button{background:#000;border:1px solid #0000;border-radius:10px;border-bottom-left-radius:10px;border-bottom-left-radius:0;color:#fff;display:block;font-size:14px;font-weight:700;margin:0 auto;padding:.4rem 1rem}.r-load-more button:hover{background:rgba(0,0,0,.871)}.r-actu-wrapper{position:relative}.r-actu-wrapper:after{content:url(../57d3b7cb1ab874660b39.svg);display:block;position:absolute;right:0;top:0;transform:translateY(-20%);width:495px;z-index:-1}.r-actu-wrapper .r-list-item-group{background:#fff;border:1px solid #d1d1d1;border-radius:15px 15px 15px 0;margin:30px auto;max-width:900px}.r-item-title{font-size:18px;font-weight:700}.r-item-description{color:#444;font-size:16px;margin-top:10px}.r-item-img{border-radius:15px 15px 15px 0}.r-actu-wrapper .r-item-img{aspect-ratio:1.6741071429;background-position:top;background-repeat:no-repeat;background-size:cover;width:100%}@media screen and (min-width:775px){.r-actu-wrapper .r-item-img{width:323px}}.r-item-read-more{margin-top:auto}.r-item-arrow-more{align-self:center;background:#f9b331;background:url(../a38272f263f8328349f2.svg);background-position:50%;background-repeat:no-repeat;background-size:20px;border-radius:50px;flex:0 0 50px;height:50px;margin-left:auto;margin-right:30px;width:50px}.r-list-item-group:hover .r-item-arrow-more{background:url(../f79b479fdc5c0fe0d553.svg),#f9b331;background-position:50%;background-repeat:no-repeat;background-size:20px}@media screen and (max-width:600px){.r-list-item{flex-direction:column}.r-item-read-more{position:relative}}.icon-baseline{align-self:center;display:inline-flex;margin-right:.4rem}.icon-baseline svg{height:1em;position:relative;top:.125em;width:1em}.dpinlb{display:inline-block;vertical-align:top}.r-content-news-info-social svg{height:30px;width:30px}.r-content-news-info-social ul{align-items:center;display:flex;margin:0}.r-content-news-info-social ul li{list-style:none}.r-content-news-info-social ul li a:hover{opacity:.7}
+.flexbin{display:flex;flex-wrap:wrap;margin:-2.5px;overflow:hidden}.flexbin:after{content:"";flex-grow:999999999;height:0;min-width:300px}.flexbin>*{display:block;flex-grow:1;height:300px;margin:2.5px;position:relative}.flexbin>*>img{height:300px;max-width:100%;min-width:100%;object-fit:cover;vertical-align:bottom}.flexbin.flexbin-margin{margin:2.5px}@media (max-width:980px){.flexbin{display:flex;flex-wrap:wrap;margin:-2.5px;overflow:hidden}.flexbin:after{content:"";flex-grow:999999999;height:0;min-width:150px}.flexbin>*{display:block;flex-grow:1;height:150px;margin:2.5px;position:relative}.flexbin>*>img{height:150px;max-width:100%;min-width:100%;object-fit:cover;vertical-align:bottom}.flexbin.flexbin-margin{margin:2.5px}}@media (max-width:400px){.flexbin{display:flex;flex-wrap:wrap;margin:-2.5px;overflow:hidden}.flexbin:after{content:"";flex-grow:999999999;height:0;min-width:100px}.flexbin>*{display:block;flex-grow:1;height:100px;margin:2.5px;position:relative}.flexbin>*>img{height:100px;max-width:100%;min-width:100%;object-fit:cover;vertical-align:bottom}.flexbin.flexbin-margin{margin:2.5px}}.breadcrumb{padding:0}.r-result-list{list-style:none;margin-top:50px;padding-left:0}#portal-column-content h1{font-size:0;position:absolute}#viewlet-below-content-description,#viewlet-below-content-title{display:none}.r-item-text{display:flex;flex-direction:column;margin:20px 30px;position:relative}.r-item-title{display:block}.r-results-numbers{margin-bottom:.5rem;width:100%}.r-results-numbers span{font-weight:700}.r-content-img{padding-bottom:60%}.new-content{margin:0 auto;max-width:700px}.r-load-more{margin-bottom:2rem;text-align:center}.r-load-more button{background:#000;border:1px solid #0000;border-radius:10px;border-bottom-left-radius:10px;border-bottom-left-radius:0;color:#fff;display:block;font-size:14px;font-weight:700;margin:0 auto;padding:.4rem 1rem}.r-load-more button:hover{background:rgba(0,0,0,.871)}.r-actu-wrapper{position:relative}.r-actu-wrapper:after{content:url(../57d3b7cb1ab874660b39.svg);display:block;position:absolute;right:0;top:0;transform:translateY(-20%);width:495px;z-index:-1}.r-actu-wrapper .r-list-item-group{background:#fff;border:1px solid #d1d1d1;border-radius:15px 15px 15px 0;margin:30px auto;max-width:900px}.r-item-title{font-size:18px;font-weight:700}.r-item-description{color:#444;font-size:16px;margin-top:10px}.r-item-img{border-radius:15px 15px 15px 0}.r-actu-wrapper .r-item-img{aspect-ratio:1.6741071429;background-position:top;background-repeat:no-repeat;background-size:cover;width:100%}@media screen and (min-width:775px){.r-actu-wrapper .r-item-img{width:323px}}.r-item-read-more{margin-top:auto}.r-item-arrow-more{align-self:center;background:#f9b331;background:url(../a38272f263f8328349f2.svg);background-position:50%;background-repeat:no-repeat;background-size:20px;border-radius:50px;flex:0 0 50px;height:50px;margin-left:auto;margin-right:30px;width:50px}.r-list-item-group:hover .r-item-arrow-more{background:url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20.44 10'%3E%3Cg data-name='Calque 2'%3E%3Cg data-name='Calque 1'%3E%3Cpath d='M1 5h18.44' data-name='Ligne 7' style='fill:none;stroke:%23fff;stroke-linecap:round;stroke-width:2px'/%3E%3Cpath d='m14.83 1 4.61 4' data-name='Ligne 8' style='fill:none;stroke:%23fff;stroke-linecap:round;stroke-width:2px'/%3E%3Cpath d='m14.83 9 4.61-4' data-name='Ligne 9' style='fill:none;stroke:%23fff;stroke-linecap:round;stroke-width:2px'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E"),#f9b331;background-position:50%;background-repeat:no-repeat;background-size:20px}@media screen and (max-width:600px){.r-list-item{flex-direction:column}.r-item-read-more{position:relative}}.icon-baseline{align-self:center;display:inline-flex;margin-right:.4rem}.icon-baseline svg{height:1em;position:relative;top:.125em;width:1em}.dpinlb{display:inline-block;vertical-align:top}.r-content-news-info-social svg{height:30px;width:30px}.r-content-news-info-social ul{align-items:center;display:flex;margin:0}.r-content-news-info-social ul li{list-style:none}.r-content-news-info-social ul li a:hover{opacity:.7}.r-item-categorie{color:#747474;font-weight:400;margin-top:5px;text-transform:uppercase}