imio.smartweb.core 1.2.39__tar.gz → 1.2.41__tar.gz

{imio.smartweb.core-1.2.39 → imio.smartweb.core-1.2.41}/CHANGES.rst

@@ -2,6 +2,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 → imio.smartweb.core-1.2.41}/PKG-INFO

@@ -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
@@ -158,6 +158,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 → imio.smartweb.core-1.2.41}/setup.py

@@ -16,7 +16,7 @@ long_description = "\n\n".join(
 
 setup(
     name="imio.smartweb.core",
-    version="1.2.39",
+    version="1.2.41",
     description="Core product for iMio websites",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

{imio.smartweb.core-1.2.39 → imio.smartweb.core-1.2.41}/src/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-1.2.39 → imio.smartweb.core-1.2.41}/src/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-1.2.39 → imio.smartweb.core-1.2.41}/src/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-1.2.39 → imio.smartweb.core-1.2.41}/src/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-1.2.39 → imio.smartweb.core-1.2.41}/src/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-1.2.39 → imio.smartweb.core-1.2.41}/src/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-1.2.39 → imio.smartweb.core-1.2.41}/src/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-1.2.39 → imio.smartweb.core-1.2.41}/src/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-1.2.39 → imio.smartweb.core-1.2.41}/src/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-1.2.39 → imio.smartweb.core-1.2.41}/src/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-1.2.39 → imio.smartweb.core-1.2.41}/src/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 → imio.smartweb.core-1.2.41}/src/imio.smartweb.core.egg-info/PKG-INFO

@@ -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
@@ -158,6 +158,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)
 -------------------