Merge e2a4c60 into 486068c

IMIO · Jan 30, 2023 · 0263491 · 0263491
2 parents 486068c + e2a4c60
commit 0263491
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,9 @@ Changelog
   [sgeulette]
 - Added `none_if_unfound` parameter in `get_user_fullname` function
   [sgeulette]
+- Added parameter `onsuccess=false` to JS function `callViewAndReload` so it is
+  possible to trigger custom JS code after a success.
+  [gbastien]
 
 0.65 (2022-12-07)
 -----------------

diff --git a/src/imio/helpers/appy_pod.html b/src/imio/helpers/appy_pod.html
@@ -3039,33 +3039,33 @@ <h6>Titre6 Titre6 Titre6</h6>
 
 <p>Cette image devrait être affichée dans le document généré, trop large elle est adaptée au document</p>
 
-<p><img alt="" src="https://i.picsum.photos/id/458/2000/2000.jpg?hmac=FF_D-rZJkcfApPCmsekc4XQ9o8dJlgaSnz7SpmxjOhQ" style="height:2000px; width:2000px" title="image.png" /></p>
+<p><img alt="" src="https://fastly.picsum.photos/id/458/2000/2000.jpg?hmac=FF_D-rZJkcfApPCmsekc4XQ9o8dJlgaSnz7SpmxjOhQ" style="height:2000px; width:2000px" title="image.png" /></p>
 
 <p>Une petite image est affichée correctement</p>
 
-<p><img alt="" src="https://i.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="height:300px; width:200px" title="image.png" /></p>
+<p><img alt="" src="https://fastly.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="height:300px; width:200px" title="image.png" /></p>
 
 <p>Image affichée sans width/height renseignés</p>
 
-<p><img alt="" src="https://i.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" title="image.png" /></p>
+<p><img alt="" src="https://fastly.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" title="image.png" /></p>
 
 <p>Image utilisant un style="float: right;"</p>
 
-<p><img alt="" src="https://i.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="float: right;" title="image.png" /></p>
+<p><img alt="" src="https://fastly.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="float: right;" title="image.png" /></p>
 <div style="clear: both;"></div>
 
 <p>Image utilisant un style="float: left;"</p>
 
-<p><img alt="" src="https://i.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="float: left;" title="image.png" /></p>
+<p><img alt="" src="https://fastly.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="float: left;" title="image.png" /></p>
 <div style="clear: both;"></div>
 
 <p>Image redimensionnée (plus petite) via les attributs "width=150px" et "height=75px", pas via "style='width:...; height:...;"</p>
 
-<p><img alt="" src="https://i.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" height="150px" width="75px" title="image.png" /></p>
+<p><img alt="" src="https://fastly.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" height="150px" width="75px" title="image.png" /></p>
 
 <p>Une image redimensionnée dans l'éditeur est rendue redimensionnée et utilise style="height:150px; width:75px"</p>
 
-<p><img alt="" src="https://i.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="height:150px; width:75px" title="image.png" /></p>
+<p><img alt="" src="https://fastly.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="height:150px; width:75px" title="image.png" /></p>
 
 <p>Image non trouvée externe</p>
 
@@ -3097,13 +3097,13 @@ <h6>Titre6 Titre6 Titre6</h6>
     <tr>
         <td>
             <p>
-                <img alt="" src="https://i.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="height:300px; width:200px" title="image.png" />
+                <img alt="" src="https://fastly.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="height:300px; width:200px" title="image.png" />
             </p>
         </td>
     </tr>
     <tr>
         <td>
-			<img alt="" src="https://i.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="height:300px; width:200px" title="image.png" />
+			<img alt="" src="https://fastly.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s" style="height:300px; width:200px" title="image.png" />
         </td>
     </tr>
 </table>

diff --git a/src/imio/helpers/browser/static/helpers.js b/src/imio/helpers/browser/static/helpers.js
@@ -24,7 +24,7 @@ function has_faceted() {
 }
 
 // ajax call managing a call to a given p_view_name and reload taking faceted into account
-function callViewAndReload(baseUrl, view_name, params, force_faceted=false) {
+function callViewAndReload(baseUrl, view_name, params, force_faceted=false, onsuccess=null) {
   redirect = '0';
   if (!force_faceted && !has_faceted()) {
     redirect = '1';
@@ -41,7 +41,11 @@ function callViewAndReload(baseUrl, view_name, params, force_faceted=false) {
             Faceted.URLHandler.hash_changed();
         }
         else {
-            window.location.href = data;
+            if (onsuccess) {
+                return onsuccess(data);
+            } else {
+                window.location.href = data;
+                }
         }
     },
     error: function(jqXHR, textStatus, errorThrown) {

diff --git a/src/imio/helpers/testing.py b/src/imio/helpers/testing.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 """Base module for unittesting."""
+from imio.helpers.cache import setup_ram_cache
+from imio.helpers.ram import imio_global_cache
 from plone.app.testing import applyProfile
 from plone.app.testing import FunctionalTesting
 from plone.app.testing import IntegrationTesting
@@ -10,6 +12,8 @@
 from plone.app.testing import TEST_USER_ID
 from plone.app.testing import TEST_USER_NAME
 from plone.testing import z2
+from zope.component import getSiteManager
+from zope.ramcache.interfaces.ram import IRAMCache
 
 import imio.helpers
 import logging
@@ -91,3 +95,8 @@ def setUp(self):
         self.portal = self.layer['portal']
         self.portal_url = self.portal.absolute_url()
         self.catalog = self.portal.portal_catalog
+
+        sml = getSiteManager(self.portal)
+        sml.unregisterUtility(provided=IRAMCache)
+        sml.registerUtility(component=imio_global_cache, provided=IRAMCache)
+        setup_ram_cache()
diff --git a/src/imio/helpers/tests/test_xhtml.py b/src/imio/helpers/tests/test_xhtml.py
@@ -19,8 +19,8 @@
 import urllib
 
 
-picsum_image1_url = 'https://i.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s'
-picsum_image2_url = 'https://i.picsum.photos/id/1082/200/200.jpg?hmac=3usO1ziO7kCseIG52ruhRigxyk39W_L9eECWe1Hs6fY'
+picsum_image1_url = 'https://fastly.picsum.photos/id/10/200/300.jpg?hmac=94QiqvBcKJMHpneU69KYg2pky8aZ6iBzKrAuhSUBB9s'
+picsum_image2_url = 'https://fastly.picsum.photos/id/1082/200/200.jpg?hmac=3usO1ziO7kCseIG52ruhRigxyk39W_L9eECWe1Hs6fY'
 
 base64_img_data = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAADWElEQVQ4ja2VX2yTBRTFj2QP" \
     "JGtoLWWMZWN/tDBW1oQSoatuUNycNnWYMV1M9nVrJgRit6msVWuBj5fhQkhB5jagIqDQP2MmkKyDbToSKjSAo2yYInUhuiFEohghcQH7HR9M" \