imio.smartweb.core 1.2.33__tar.gz → 1.2.34__tar.gz

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/CHANGES.rst

@@ -2,6 +2,16 @@ Changelog
 =========
 
 
+1.2.34 (2024-02-19)
+-------------------
+
+- MWEBRCHA-13 : Add content rules to notify reviewers (Install via `validation` profile)
+  [laulaz]
+
+- MWEBRCHA-13 : Fix plone versioning (Work on SectionText / Remove from SectionHTML)
+  [boulch]
+
+
 1.2.33 (2024-02-09)
 -------------------
 

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.33
+Version: 1.2.34
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -158,6 +158,16 @@ Changelog
 =========
 
 
+1.2.34 (2024-02-19)
+-------------------
+
+- MWEBRCHA-13 : Add content rules to notify reviewers (Install via `validation` profile)
+  [laulaz]
+
+- MWEBRCHA-13 : Fix plone versioning (Work on SectionText / Remove from SectionHTML)
+  [boulch]
+
+
 1.2.33 (2024-02-09)
 -------------------
 

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/setup.py

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

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/browser/sitemap.py

@@ -11,8 +11,6 @@ from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.utils import normalizeString
 from zope.component import getUtility
 
-import re
-
 
 class CustomSiteMapView(SiteMapView):
 

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/browser/utils.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from Products.Five.browser import BrowserView
 from imio.smartweb.core.contents import IPages
 from imio.smartweb.core.contents.pages.procedure.utils import sign_url
 from imio.smartweb.core.utils import get_plausible_vars
@@ -7,12 +6,12 @@ from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone import api
 from plone.api.portal import get_registry_record
 from plone.formwidget.geolocation.vocabularies import _ as _geo
+from Products.Five.browser import BrowserView
 from zope.component import getMultiAdapter
 from zope.i18n import translate
 
 import json
 import requests
-import os
 
 
 class UtilsView(BrowserView):

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/contents/sections/contact/utils.py

@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from datetime import date, datetime
-from datetime import timedelta
-from decimal import Decimal
 from imio.smartweb.common.contact_utils import ContactProperties as ContactSchedule
 from imio.smartweb.common.utils import rich_description
 from imio.smartweb.core.utils import batch_results
@@ -11,7 +8,6 @@ from imio.smartweb.core.utils import hash_md5
 from imio.smartweb.locales import SmartwebMessageFactory as _
 from plone import api
 from zope.i18n import translate
-from zope.i18nmessageid import MessageFactory
 
 import json
 

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/contents/sections/macros.pt

@@ -56,15 +56,19 @@
         <tal:dates define="modified context/ModificationDate">
           <span class="documentModified"
                 tal:condition="modified">
-            <span i18n:translate="">
-              Modified
-            </span>
-            <span class="pat-display-time"
-                  data-pat-display-time="from-now: true"
-                  tal:attributes="datetime modified"
-                  tal:content="modified">
-              Modified
-            </span>
+            <a class="documentModified"
+               tal:attributes="href string:${context/absolute_url}/@@historyview"
+               tal:omit-tag="python:context.portal_type != 'imio.smartweb.SectionText'">
+              <span i18n:translate="">
+                Modified
+              </span>
+              <span class="pat-display-time"
+                    data-pat-display-time="from-now: true"
+                    tal:attributes="datetime modified"
+                    tal:content="modified">
+                Modified
+              </span>
+            </a>
           </span>
         </tal:dates>
 

imio.smartweb.core-1.2.34/src/imio/smartweb/core/profiles/default/diff_tool.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object>
+ <difftypes>
+  <type portal_type="imio.smartweb.SectionText">
+   <field name="any" difftype="Compound Diff for Dexterity types"/>
+  </type>
+ </difftypes>
+</object>

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <metadata>
-  <version>1052</version>
+  <version>1053</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
     <dependency>profile-plone.app.imagecropping:default</dependency>

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/profiles/default/repositorytool.xml

@@ -2,6 +2,7 @@
 <repositorytool>
   <policymap>
     <type name="imio.smartweb.SectionText">
+      <policy name="at_edit_autoversion" />
       <policy name="version_on_revert"/>
     </type>
   </policymap>

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/profiles/default/types/imio.smartweb.SectionHTML.xml

@@ -32,7 +32,6 @@
     <element value="plone.namefromtitle"/>
     <element value="plone.locking"/>
     <element value="plone.shortname"/>
-    <element value="plone.versioning" />
   </property>
 
 </object>

imio.smartweb.core-1.2.34/src/imio/smartweb/core/profiles/validation/contentrules.xml

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<contentrules>
+ <rule name="rule-1" title="Notification de contenu à valider"
+    cascading="False" description="" enabled="True"
+    event="Products.CMFCore.interfaces.IActionSucceededEvent"
+    stop-after="False">
+  <conditions>
+   <condition type="plone.conditions.PortalType">
+    <property name="check_types">
+     <element>imio.smartweb.Page</element>
+     <element>imio.smartweb.PortalPage</element>
+     <element>imio.smartweb.Procedure</element>
+    </property>
+   </condition>
+   <condition type="plone.conditions.WorkflowState">
+    <property name="wf_states">
+     <element>pending</element>
+    </property>
+   </condition>
+  </conditions>
+  <actions>
+   <action type="plone.actions.Mail">
+    <property name="subject">Nouveau contenu sur le site</property>
+    <property name="source"/>
+    <property name="recipients">${reviewer_emails}</property>
+    <property name="exclude_actor">False</property>
+    <property name="message">Un nouveau contenu a été soumis à validation. Cliquez sur le lien pour aller le valider ou le refuser : ${absolute_url}</property>
+   </action>
+   <action type="plone.actions.Logger">
+    <property name="targetLogger">imio.smartweb.core</property>
+    <property name="loggingLevel">20</property>
+    <property
+       name="message">Content to review notification sent for &amp;c.</property>
+   </action>
+  </actions>
+ </rule>
+ <rule name="rule-2" title="Notification de modification de section de contenu publié"
+    cascading="False" description="" enabled="True"
+    event="zope.lifecycleevent.interfaces.IObjectModifiedEvent"
+    stop-after="False">
+  <conditions>
+   <condition type="plone.conditions.PortalType">
+    <property name="check_types">
+     <element>imio.smartweb.SectionText</element>
+    </property>
+   </condition>
+   <condition type="plone.conditions.TalesExpression">
+    <property
+       name="tales_expression">python: hasattr(here, &quot;aq_parent&quot;) and portal.portal_workflow.getInfoFor(here.aq_parent, &quot;review_state&quot;, &quot;&quot;) == &quot;published&quot;</property>
+   </condition>
+  </conditions>
+  <actions>
+   <action type="plone.actions.Mail">
+    <property name="subject">Contenu publié modifié sur le site</property>
+    <property name="source"/>
+    <property name="recipients">${reviewer_emails}</property>
+    <property name="exclude_actor">False</property>
+    <property name="message">Une section texte d&#x27;un contenu déjà publié a été modifiée. Cliquez sur le lien pour consulter la modification effectuée : ${absolute_url}/@@historyview</property>
+   </action>
+   <action type="plone.actions.Logger">
+    <property name="targetLogger">imio.smartweb.core</property>
+    <property name="loggingLevel">20</property>
+    <property
+       name="message">Published content change notification sent for &amp;c (user: &amp;u).</property>
+   </action>
+  </actions>
+ </rule>
+ <rule name="rule-3" title="Notification d'ajout de section à un contenu publié"
+    cascading="False" description="" enabled="True"
+    event="zope.lifecycleevent.interfaces.IObjectAddedEvent"
+    stop-after="False">
+  <conditions>
+   <condition type="plone.conditions.PortalType">
+    <property name="check_types">
+     <element>imio.smartweb.SectionText</element>
+    </property>
+   </condition>
+   <condition type="plone.conditions.TalesExpression">
+    <property
+       name="tales_expression">python: hasattr(here, &quot;aq_parent&quot;) and portal.portal_workflow.getInfoFor(here.aq_parent, &quot;review_state&quot;, &quot;&quot;) == &quot;published&quot;</property>
+   </condition>
+  </conditions>
+  <actions>
+   <action type="plone.actions.Mail">
+    <property name="subject">Contenu publié modifié sur le site</property>
+    <property name="source"/>
+    <property name="recipients">${reviewer_emails}</property>
+    <property name="exclude_actor">False</property>
+    <property name="message">Une section texte a été ajoutée à un contenu déjà publié. Cliquez sur le lien pour consulter la section texte ajoutée : ${absolute_url}</property>
+   </action>
+   <action type="plone.actions.Logger">
+    <property name="targetLogger">imio.smartweb.core</property>
+    <property name="loggingLevel">20</property>
+    <property
+       name="message">Published content add notification sent for &amp;c (user: &amp;u).</property>
+   </action>
+  </actions>
+ </rule>
+ <assignment name="rule-1" bubbles="True" enabled="True" location=""/>
+ <assignment name="rule-2" bubbles="True" enabled="True" location=""/>
+ <assignment name="rule-3" bubbles="True" enabled="True" location=""/>
+</contentrules>

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/profiles.zcml

@@ -45,6 +45,14 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="validation"
+      title="imio.smartweb.core validation"
+      directory="profiles/validation"
+      description="Installs smartweb validation content rules"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <genericsetup:registerProfile
       name="last-compilation"
       title="imio.smartweb.core last compilation dates"

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/tests/test_sections.py

@@ -588,3 +588,21 @@ class TestSections(ImioSmartwebTestCase):
         self.assertEqual(
             view.get_class(section), "sectiontext my-css col-sm-3 with-background"
         )
+
+    def test_sections_history(self):
+        api.content.transition(self.page, "publish")
+        section_types = get_sections_types()
+        page_view = queryMultiAdapter((self.page, self.request), name="full_view")()
+        count_historyview_link = page_view.count("@@historyview")
+        self.assertEqual(count_historyview_link, 1)
+        for section_type in section_types:
+            api.content.create(
+                container=self.page,
+                type=section_type,
+                title="Title of my {}".format(section_type),
+            )
+        page_view = queryMultiAdapter((self.page, self.request), name="full_view")()
+        section_text = api.content.find(portal_type="imio.smartweb.SectionText")[0]
+        self.assertIn(f"{section_text.getURL()}/@@historyview", page_view)
+        # One more history view link on SectionText
+        self.assertEqual(page_view.count("@@historyview"), count_historyview_link + 1)

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/tests/test_sitemap.py

@@ -131,7 +131,7 @@ class TestPage(ImioSmartwebTestCase):
         self.json_news = get_json("resources/json_rest_news.json")
         self.json_events = get_json("resources/json_rest_events.json")
 
-        contact_search_url = f"http://localhost:8080/Plone/@search?selected_entities=396907b3b1b04a97896b12cc792c77f8&portal_type=imio.directory.Contact&fullobjects=0&sort_on=sortable_title"
+        contact_search_url = "http://localhost:8080/Plone/@search?selected_entities=396907b3b1b04a97896b12cc792c77f8&portal_type=imio.directory.Contact&fullobjects=0&sort_on=sortable_title"
         news_search_url = f"http://localhost:8080/Plone/@search?selected_news_folders={self.rest_news.selected_news_folder}&portal_type=imio.news.NewsItem&fullobjects=0&sort_on=sortable_title"
         events_search_url = f"http://localhost:8080/Plone/@events?selected_agendas={self.rest_agenda.selected_agenda}&portal_type=imio.events.Event&fullobjects=0&sort_on=sortable_title"
 

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/upgrades/configure.zcml

@@ -195,6 +195,14 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:registerProfile
+      name="upgrade_1052_to_1053"
+      title="Upgrade core from 1052 to 1053"
+      directory="profiles/1052_to_1053"
+      description="Fix versioning on imio.smartweb.SectionText"
+      provides="Products.GenericSetup.interfaces.EXTENSION"
+      />
+
   <genericsetup:upgradeStep
       title="Configure first official release"
       description="Run needed profiles steps and reindex catalog"
@@ -729,4 +737,14 @@
     />
   </genericsetup:upgradeSteps>
 
+  <genericsetup:upgradeSteps
+      source="1052"
+      destination="1053"
+      profile="imio.smartweb.core:default">
+    <genericsetup:upgradeDepends
+        title="Fix versioning on imio.smartweb.SectionText"
+        import_profile="imio.smartweb.core.upgrades:upgrade_1052_to_1053"
+        />
+  </genericsetup:upgradeSteps>
+
 </configure>

imio.smartweb.core-1.2.34/src/imio/smartweb/core/upgrades/profiles/1052_to_1053/diff_tool.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<object>
+ <difftypes>
+  <type portal_type="imio.smartweb.SectionText">
+   <field name="any" difftype="Compound Diff for Dexterity types"/>
+  </type>
+ </difftypes>
+</object>

imio.smartweb.core-1.2.34/src/imio/smartweb/core/upgrades/profiles/1052_to_1053/repositorytool.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositorytool>
+  <policymap purge="false">
+    <type name="imio.smartweb.SectionText">
+      <policy name="at_edit_autoversion" />
+      <policy name="version_on_revert" />
+    </type>
+  </policymap>
+</repositorytool>

imio.smartweb.core-1.2.34/src/imio/smartweb/core/upgrades/profiles/1052_to_1053/types/imio.smartweb.SectionHTML.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<object xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    name="imio.smartweb.SectionHTML"
+    meta_type="Dexterity FTI"
+    i18n:domain="imio.smartweb">
+
+  <!-- Enabled behaviors -->
+  <property name="behaviors" purge="true">
+    <element value="plone.namefromtitle"/>
+    <element value="plone.locking"/>
+    <element value="plone.shortname"/>
+  </property>
+
+</object>

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio/smartweb/core/viewlets/ogptags.py

@@ -7,7 +7,6 @@ from imio.smartweb.core.contents import IDirectoryView
 from imio.smartweb.core.contents import IEventsView
 from imio.smartweb.core.contents import INewsView
 from imio.smartweb.core.utils import get_json
-from imio.smartweb.core.utils import get_scale_url
 from imio.smartweb.core.utils import get_wca_token
 from imio.smartweb.core.utils import hash_md5
 from plone import api
@@ -117,7 +116,7 @@ class OgpTagsViewlet(HeaderViewlet):
             return ""
         try:
             url = f'{self.request.ACTUAL_URL}?u={self.request.form["u"]}'
-        except:
+        except Exception:
             url = self.request.URL
         return url
 

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio.smartweb.core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imio.smartweb.core
-Version: 1.2.33
+Version: 1.2.34
 Summary: Core product for iMio websites
 Home-page: https://github.com/imio/imio.smartweb.core
 Author: Christophe Boulanger
@@ -158,6 +158,16 @@ Changelog
 =========
 
 
+1.2.34 (2024-02-19)
+-------------------
+
+- MWEBRCHA-13 : Add content rules to notify reviewers (Install via `validation` profile)
+  [laulaz]
+
+- MWEBRCHA-13 : Fix plone versioning (Work on SectionText / Remove from SectionHTML)
+  [boulch]
+
+
 1.2.33 (2024-02-09)
 -------------------
 

{imio.smartweb.core-1.2.33 → imio.smartweb.core-1.2.34}/src/imio.smartweb.core.egg-info/SOURCES.txt

@@ -331,6 +331,7 @@ src/imio/smartweb/core/profiles/default/actions.xml
 src/imio/smartweb/core/profiles/default/browserlayer.xml
 src/imio/smartweb/core/profiles/default/catalog.xml
 src/imio/smartweb/core/profiles/default/controlpanel.xml
+src/imio/smartweb/core/profiles/default/diff_tool.xml
 src/imio/smartweb/core/profiles/default/metadata.xml
 src/imio/smartweb/core/profiles/default/repositorytool.xml
 src/imio/smartweb/core/profiles/default/rolemap.xml
@@ -384,6 +385,7 @@ src/imio/smartweb/core/profiles/testing/types/imio.smartweb.DirectoryView.xml
 src/imio/smartweb/core/profiles/testing/types/imio.smartweb.EventsView.xml
 src/imio/smartweb/core/profiles/testing/types/imio.smartweb.NewsView.xml
 src/imio/smartweb/core/profiles/uninstall/browserlayer.xml
+src/imio/smartweb/core/profiles/validation/contentrules.xml
 src/imio/smartweb/core/rest/__init__.py
 src/imio/smartweb/core/rest/authentic_sources.py
 src/imio/smartweb/core/rest/configure.zcml
@@ -562,6 +564,9 @@ src/imio/smartweb/core/upgrades/profiles/1047_to_1048/types/imio.smartweb.Sectio
 src/imio/smartweb/core/upgrades/profiles/1047_to_1048/types/imio.smartweb.SectionNews.xml
 src/imio/smartweb/core/upgrades/profiles/1047_to_1048/types/imio.smartweb.SectionSelections.xml
 src/imio/smartweb/core/upgrades/profiles/1051_to_1052/actions.xml
+src/imio/smartweb/core/upgrades/profiles/1052_to_1053/diff_tool.xml
+src/imio/smartweb/core/upgrades/profiles/1052_to_1053/repositorytool.xml
+src/imio/smartweb/core/upgrades/profiles/1052_to_1053/types/imio.smartweb.SectionHTML.xml
 src/imio/smartweb/core/viewlets/__init__.py
 src/imio/smartweb/core/viewlets/actions.py
 src/imio/smartweb/core/viewlets/arcgis_header.pt