imio.smartweb.core 1.2.39__py3-none-any.whl → 1.2.41__py3-none-any.whl

imio/smartweb/core/contents/rest/base.py

@@ -19,7 +19,7 @@ class BaseEndpoint(object):
         self.request = request
 
     def __call__(self):
-        results = get_json(self.query_url)
+        results = get_json(self.query_url, timeout=20)
         return results
 
     @property

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

@@ -37,6 +37,12 @@ class IEventsView(model.Schema):
         default=True,
     )
 
+    display_agendas_titles = schema.Bool(
+        title=_("Display agendas titles"),
+        description=_("If checked, display agendas titles"),
+        required=False,
+    )
+
     only_past_events = schema.Bool(
         title=_("Display only past events"),
         description=_("If selected, only past events will be displayed"),

imio/smartweb/core/contents/rest/events/endpoint.py

@@ -13,7 +13,7 @@ from zope.interface import Interface
 class BaseEventsEndpoint(BaseEndpoint):
     def __call__(self):
         results = super(BaseEventsEndpoint, self).__call__()
-        if not results.get("items"):
+        if not results or not results.get("items"):
             return results
         orientation = self.context.orientation
         for result in results["items"]:
@@ -35,6 +35,7 @@ class BaseEventsEndpoint(BaseEndpoint):
         params = [
             "selected_agendas={}".format(self.context.selected_agenda),
             "metadata_fields=category",
+            "metadata_fields=container_uid",
             "metadata_fields=topics",
             "metadata_fields=start",
             "metadata_fields=end",

imio/smartweb/core/contents/rest/events/view.pt

@@ -13,7 +13,8 @@
                                        current-language view/current_language;
                                        display-map view/display_map;
                                        only-past-events view/only_past_events;
-                                       view-path view/view_path;"></smartweb-events>
+                                       view-path view/view_path;
+                                       display_agendas_titles view/display_agendas_titles;"></smartweb-events>
     </div>
     </metal:main>
   </body>

imio/smartweb/core/contents/rest/events/view.py

@@ -21,3 +21,7 @@ class EventsViewView(BaseRestView):
     @property
     def only_past_events(self):
         return self.context.only_past_events
+
+    @property
+    def display_agendas_titles(self):
+        return self.context.display_agendas_titles

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

@@ -21,6 +21,12 @@ class INewsView(model.Schema):
         title=_("Number of items to display"), default=20, required=True
     )
 
+    display_newsfolders_titles = schema.Bool(
+        title=_("Display news folders titles"),
+        description=_("If checked, display news folders titles"),
+        required=False,
+    )
+
 
 @implementer(INewsView)
 class NewsView(RestView):

imio/smartweb/core/contents/rest/news/endpoint.py

@@ -39,6 +39,7 @@ class BaseNewsEndpoint(BaseEndpoint):
             "selected_news_folders={}".format(self.context.selected_news_folder),
             "portal_type=imio.news.NewsItem",
             "metadata_fields=category",
+            "metadata_fields=container_uid",
             "metadata_fields=topics",
             "metadata_fields=has_leadimage",
             "metadata_fields=UID",

imio/smartweb/core/contents/rest/news/view.pt

@@ -11,7 +11,8 @@
                                          propose-url view/propose_url;
                                          orientation view/orientation;
                                          current-language view/current_language;
-                                         view-path view/view_path;"></smartweb-news>
+                                         view-path view/view_path;
+                                         display_newsfolders_titles view/display_newsfolders_titles;"></smartweb-news>
       </div>
     </metal:main>
   </body>

imio/smartweb/core/contents/rest/news/view.py

@@ -13,3 +13,7 @@ class NewsViewView(BaseRestView):
     @property
     def propose_url(self):
         return api.portal.get_registry_record("smartweb.propose_news_url")
+
+    @property
+    def display_newsfolders_titles(self):
+        return self.context.display_newsfolders_titles

imio/smartweb/core/contents/sections/common_templates/table.pt

@@ -56,7 +56,8 @@
                                    show_lead_image python:getattr(context, 'show_items_lead_image', True);
                                    portal context/@@plone_portal_state/portal;
                                    open_in_new_tab item/open_in_new_tab | nothing;"
-                       class="table_display">
+                        tal:attributes="class string:table_display ${item/container_id | nothing};"
+                      >
                       <a tal:attributes="class python:'table_image no-image' if no_icon_no_image else 'table_image';
                                          href item/url;
                                          target python:'_blank' if (open_in_new_tab and not can_edit_sections) else '';">
@@ -97,7 +98,10 @@
                             </tal:def>
                           </tal:if>
                         </div>
-
+                        <div tal:condition="view/display_container_title"
+                             class="auth_source_container_title"
+                             tal:content="item/container_title | nothing">
+                        </div>
                         <div class="table_title">
                           <span tal:content="item/title" />
                         </div>

imio/smartweb/core/tests/test_rest.py

@@ -369,6 +369,7 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
             "http://localhost:8080/Plone/@events?"
             "selected_agendas={}&"
             "metadata_fields=category&"
+            "metadata_fields=container_uid&"
             "metadata_fields=topics&"
             "metadata_fields=start&"
             "metadata_fields=end&"
@@ -425,6 +426,7 @@ class SectionsFunctionalTest(ImioSmartwebTestCase):
             "selected_news_folders={}&"
             "portal_type=imio.news.NewsItem&"
             "metadata_fields=category&"
+            "metadata_fields=container_uid&"
             "metadata_fields=topics&"
             "metadata_fields=has_leadimage&"
             "metadata_fields=UID&"

{imio.smartweb.core-1.2.39.dist-info → imio.smartweb.core-1.2.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.39
+Version: 1.2.41
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -189,6 +189,23 @@ Changelog
 =========
 
 
+1.2.41 (2024-04-04)
+-------------------
+
+- Set higher timeout because retrieving some datas can take some time
+  [boulch]
+
+
+1.2.40 (2024-04-02)
+-------------------
+
+- MWEBPM-9 : Add container_uid in rest views to retrieve agenda id/title or news folder id/title
+  [boulch]
+
+- MWEBPM-9 : Retrieve agenda id/title  or news folder id/title and display it in "common templates" table
+  [boulch]
+
+
 1.2.39 (2024-03-28)
 -------------------
 

{imio.smartweb.core-1.2.39.dist-info → imio.smartweb.core-1.2.41.dist-info}/RECORD

@@ -1,4 +1,4 @@
-imio.smartweb.core-1.2.39-py3.10-nspkg.pth,sha256=wnCUSUElqssZ5FI3x-9HqwD229HQ-bAuPoDUNJHmMtU,1684
+imio.smartweb.core-1.2.41-py3.10-nspkg.pth,sha256=wnCUSUElqssZ5FI3x-9HqwD229HQ-bAuPoDUNJHmMtU,1684
 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
@@ -191,7 +191,7 @@ imio/smartweb/core/contents/pages/procedure/content.py,sha256=e_kv7YsRF0vblfpxqq
 imio/smartweb/core/contents/pages/procedure/utils.py,sha256=EATKvK72QPQheLXCXCoADYMjA3UfgPtkOPKdqnEyX64,1291
 imio/smartweb/core/contents/pages/procedure/view.py,sha256=UeZwtdn20lCo7qbqqPcsD9LL69vNTq4m_wXB4nv8jMo,408
 imio/smartweb/core/contents/rest/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-imio/smartweb/core/contents/rest/base.py,sha256=aX-wzmaT-ZP3sozu-BpRkZe-dNSL0QuLK0L7WxF40LM,2416
+imio/smartweb/core/contents/rest/base.py,sha256=8VWBC7EKJUW6rNVH8DLD4JWGCHY7lDSQ-xJtEOsdBW0,2428
 imio/smartweb/core/contents/rest/configure.zcml,sha256=vANiA3brvm8rsJIUSVNf0BdlEnejpEGXoC82-hpxKkA,433
 imio/smartweb/core/contents/rest/traversal.py,sha256=KLNGhUmvTAzaRqSIzT3B28HgMBK4vcNV75AfyIesjN8,540
 imio/smartweb/core/contents/rest/utils.py,sha256=3R8BSRBzYCTL5sBtVraoHvEwhN6e1PyUY5mjczKLlFk,3112
@@ -204,16 +204,16 @@ imio/smartweb/core/contents/rest/directory/view.pt,sha256=CN5111--p6j0xZ1Tm_Ohkw
 imio/smartweb/core/contents/rest/directory/view.py,sha256=rN4k7sqrd32TNMBBOc7RQeosRgYM-dl645Pi1GjVvwA,507
 imio/smartweb/core/contents/rest/events/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/core/contents/rest/events/configure.zcml,sha256=ufUHdGMkGd57zgZ4_DxvoK4Zn7_AC_A3_TnLkmdYRhs,1017
-imio/smartweb/core/contents/rest/events/content.py,sha256=oZMwSdp_B4f-y0IgAazNy3Zv4-qrEUC_tthOndO-zWc,1488
-imio/smartweb/core/contents/rest/events/endpoint.py,sha256=71rHO0-nlp42Yi5kJPqX4sCxFljiLUsl8np8ZxMy16g,2581
-imio/smartweb/core/contents/rest/events/view.pt,sha256=nRLBP6Eux9O6XJoUGe96lOlxAZe4-U9i7tizzgYwvOc,895
-imio/smartweb/core/contents/rest/events/view.py,sha256=_qq7xCnGmtK8FG0hxjAwjNT2aLchOm11Jz0-AjTmqmc,590
+imio/smartweb/core/contents/rest/events/content.py,sha256=4T0dCsoQx6c1uxISEeqdUggI0q4YE80tQimhALwRmug,1665
+imio/smartweb/core/contents/rest/events/endpoint.py,sha256=FDbcZYGMjUu9NwO8KBAenAuISGQbxnBQ5vvTeOLRltU,2641
+imio/smartweb/core/contents/rest/events/view.pt,sha256=9q_Wk5vIcvP9zISBv8OrdeTB3kJoPCT0DydZ9qBFF-Q,986
+imio/smartweb/core/contents/rest/events/view.py,sha256=WiqrMT_fS6JIRyBiDMmcgsHKCupI-CfYQh12yaZZQE8,694
 imio/smartweb/core/contents/rest/news/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/core/contents/rest/news/configure.zcml,sha256=f1kNWMjcHul5_dKv51KY_GQII-Cvx-uL7N9Z25zlN8c,1005
-imio/smartweb/core/contents/rest/news/content.py,sha256=awCW9vXglOPIOLsCB9w7M9O5eKGyb755oGZMOdhB_6g,755
-imio/smartweb/core/contents/rest/news/endpoint.py,sha256=JhJ-YoaszlSfhZnWrc0UELO4Y8ihA3TPE7F9Upptyxk,2668
-imio/smartweb/core/contents/rest/news/view.pt,sha256=OUKvgb7dnkbfyPm30tEvqPeGBSqufLc8A4ptUttpaGA,763
-imio/smartweb/core/contents/rest/news/view.py,sha256=8dkfrEHi4c7AbgDU1CIfWd5xRz8K28v2DCSY2j-sv0Y,410
+imio/smartweb/core/contents/rest/news/content.py,sha256=gSyOuVlvv90HIWhjdABE7g4mngVF6agqZdC6pBDCgJI,946
+imio/smartweb/core/contents/rest/news/endpoint.py,sha256=WnD0GRoWUXk_AhprfZhIQKjQEzukyf2Kz652bX4yY8A,2713
+imio/smartweb/core/contents/rest/news/view.pt,sha256=b376PXHQdB0PQlGe1ylub8sjEqwHXmtAkQHReA0goss,864
+imio/smartweb/core/contents/rest/news/view.py,sha256=ZmRZmb9FEKJE7K5Y07qYPmtT9sa2Rs6nN1n9DErzcSM,522
 imio/smartweb/core/contents/rest/search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/core/contents/rest/search/configure.zcml,sha256=BTFcBQ28NINyEfoVgYwJgf0JWvk99ewSKgOYx91lZy4,951
 imio/smartweb/core/contents/rest/search/endpoint.py,sha256=i5LMM0R1Xvpy76JHO6pI98G41Xep15fPR9uv9rqropo,9797
@@ -228,7 +228,7 @@ imio/smartweb/core/contents/sections/collection/configure.zcml,sha256=Ak4UbKFjog
 imio/smartweb/core/contents/sections/collection/content.py,sha256=DMmU9rIaRlbRjIaot5RHXu59vJmAbun0FCmyahWhBCM,2379
 imio/smartweb/core/contents/sections/collection/views.py,sha256=G8Q7zlFmuEKKCmAGLj5cVL3axebzf5ZlSVRYx9q45U4,1470
 imio/smartweb/core/contents/sections/common_templates/carousel.pt,sha256=vcRaxpkNYQHjyIcLJEiOPEZ2yOvZKkXr_28utTbDk5U,5694
-imio/smartweb/core/contents/sections/common_templates/table.pt,sha256=_6XcDToJUCSof4NEbCfbpNWTTcQloucv7QJhtQKalm4,6447
+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
@@ -400,7 +400,7 @@ imio/smartweb/core/tests/test_plausibleview.py,sha256=G1ryfnz3TuQBG8VFO5KzEylT5D
 imio/smartweb/core/tests/test_portal_page.py,sha256=hIqg4eb91o8BsSj7eSKdvoxehzOXt8bzpg1o5ej__zg,7215
 imio/smartweb/core/tests/test_procedure.py,sha256=0w8phOwYfpp9vb3KDsnwjX8AhQXWdodA06W4koderQo,6474
 imio/smartweb/core/tests/test_redirect_to_main_react_view.py,sha256=k4gU6xBIA5m8Vrb27rt8nWCs8ix2Lf9j49WnIXl4eO0,2990
-imio/smartweb/core/tests/test_rest.py,sha256=PO4LhMzhH4q4kmBp7amVrGP3HPC68f0AxW8D1_x7E5c,25026
+imio/smartweb/core/tests/test_rest.py,sha256=y2aM_D69zi1GDhheqBANBqMLIEAFEUIKaDQPJkx7U50,25116
 imio/smartweb/core/tests/test_robot.py,sha256=NQ7AkN4tEva3bgGjMxmyqY0zIo4pJPnPOwnD9hmrTVI,926
 imio/smartweb/core/tests/test_search.py,sha256=VryeRI4_5CvnStKOoNoG95M2WTy7Lyy_AhHIDG40M14,2182
 imio/smartweb/core/tests/test_section_contact.py,sha256=vwCcls19KSiciaAXYG7C3SwOMWao8VGcnLvsU8ikxB0,23166
@@ -719,10 +719,10 @@ imio/smartweb/core/webcomponents/src/utils/Map.jsx,sha256=x9xi6Ym29ENfIdeysHeh0g
 imio/smartweb/core/webcomponents/src/utils/Map.scss,sha256=xXWz0O-JBwSZrzz2XeQdN4nZEOjppU2sVFtlLQOitQ8,77
 imio/smartweb/core/webcomponents/src/utils/translation.js,sha256=SmhBsvncTNx95019NNz5uAm1foKqeKjcC5i9ZMo1G3E,6629
 imio/smartweb/core/webcomponents/src/utils/url.js,sha256=iyl_1QXfPBgUn0LEbZYT_zMEEjmj5DMiEz44Z6AKLcg,244
-imio.smartweb.core-1.2.39.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio.smartweb.core-1.2.39.dist-info/LICENSE.rst,sha256=RzkMFz6AX3-cHd531zd2YQcXai8RIbjFWTs6m66Y5u4,653
-imio.smartweb.core-1.2.39.dist-info/METADATA,sha256=tbt2E6Il-hDgjHnjTELh_QPZdvWKipFij8meN_LScJk,50907
-imio.smartweb.core-1.2.39.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-imio.smartweb.core-1.2.39.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio.smartweb.core-1.2.39.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio.smartweb.core-1.2.39.dist-info/RECORD,,
+imio.smartweb.core-1.2.41.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio.smartweb.core-1.2.41.dist-info/LICENSE.rst,sha256=RzkMFz6AX3-cHd531zd2YQcXai8RIbjFWTs6m66Y5u4,653
+imio.smartweb.core-1.2.41.dist-info/METADATA,sha256=OXghS94hSzjWYGl2V84xbHpBWnKF4ZIRaAR5XxfQSxc,51300
+imio.smartweb.core-1.2.41.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+imio.smartweb.core-1.2.41.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio.smartweb.core-1.2.41.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio.smartweb.core-1.2.41.dist-info/RECORD,,