Merge remote-tracking branch 'upstream/master' into zope4py3

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bootloader_js.js

@@ -104,6 +104,14 @@ var repair = false;
             '#page=settings_configurator',
             '#/?page=settings_configurator'
           );
+        } else if (gadget.props.redirect_url.hash
+            .startsWith('#page=ojsm_landing')) {
+          // Make monitoring app still compatible with old instances setup URLs
+          gadget.props.redirect_url.hash =
+            gadget.props.redirect_url.hash.replace(
+            '#page=ojsm_landing',
+            '#/?page=ojsm_landing'
+          );
         }
       }
     })

bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bootloader_js.xml

@@ -234,7 +234,7 @@
                   </item>
                   <item>
                       <key> <string>actor</string> </key>
-                      <value> <string>zope</string> </value>
+                      <value> <unicode>zope</unicode> </value>
                   </item>
                   <item>
                       <key> <string>comment</string> </key>
@@ -248,7 +248,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>996.26493.30077.17766</string> </value>
+                      <value> <string>1021.28560.35460.52275</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -268,7 +268,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1637925065.64</float>
+                              <float>1734538594.95</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_tiosafe_core/DocumentTemplateItem/portal_components/document.erp5.WebServiceRequest.py

@@ -38,7 +38,7 @@ except ImportError:
 # pylint:enable=no-name-in-module
 from lxml import etree
 from zLOG import LOG, ERROR, INFO
-from erp5.component.tool.WebServiceTool import ConnectionError
+from erp5.component.tool.WebServiceTool import WebServiceConnectionError
 from Products.ERP5Type.Cache import CachingMethod
 import six
 
@@ -193,7 +193,7 @@ class WebServiceRequest(XMLObject, ZopePageTemplate):
     # Call the method
     try:
       url, xml = callRequest(self, method_name, *args, **kw)
-    except ConnectionError as msg:
+    except WebServiceConnectionError as msg:
       if test_mode:
         error = msg
         url = connection.url

bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring.xml

@@ -104,7 +104,7 @@
                   <dictionary>
                     <item>
                         <key> <string>_defined_in_class</string> </key>
-                        <value> <bool>True</bool> </value>
+                        <value> <int>1</int> </value>
                     </item>
                     <item>
                         <key> <string>_hookname</string> </key>
@@ -544,7 +544,7 @@
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>1019.37281.47800.48247</string> </value>
+                      <value> <string>1020.20655.56844.35481</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -564,7 +564,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1730218552.03</float>
+                              <float>1734537516.03</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring/app.xml

@@ -104,7 +104,7 @@
                   <dictionary>
                     <item>
                         <key> <string>_defined_in_class</string> </key>
-                        <value> <bool>True</bool> </value>
+                        <value> <int>1</int> </value>
                     </item>
                     <item>
                         <key> <string>_hookname</string> </key>
@@ -579,7 +579,7 @@ WebSection_getMonitorPrecacheManifestList</string> </value>
                   </item>
                   <item>
                       <key> <string>serial</string> </key>
-                      <value> <string>1019.37281.53022.31078</string> </value>
+                      <value> <string>1020.20655.61313.64494</string> </value>
                   </item>
                   <item>
                       <key> <string>state</string> </key>
@@ -599,7 +599,7 @@ WebSection_getMonitorPrecacheManifestList</string> </value>
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1730218556.13</float>
+                              <float>1734537516.03</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring/hateoas_appcache.xml

@@ -69,7 +69,7 @@
                   <dictionary>
                     <item>
                         <key> <string>_defined_in_class</string> </key>
-                        <value> <bool>True</bool> </value>
+                        <value> <int>1</int> </value>
                     </item>
                     <item>
                         <key> <string>_hookname</string> </key>
@@ -359,7 +359,7 @@
                           </tuple>
                           <state>
                             <tuple>
-                              <float>1730218552.03</float>
+                              <float>1734537516.03</float>
                               <string>UTC</string>
                             </tuple>
                           </state>

bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringLanding.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="_reconstructor" module="copy_reg"/>
+                </klass>
+                <tuple>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                  <global name="object" module="__builtin__"/>
+                  <none/>
+                </tuple>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>text/html</string> </value>
+        </item>
+        <item>
+            <key> <string>expand</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>testMonitoringLanding</string> </value>
+        </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <unicode></unicode> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringLanding.zpt

+<html xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Test SlapOS Monitoring UI (expected failure)</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test SlapOS Monitoring UI</td></tr>
+</thead><tbody>
+<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />
+<tr>
+  <td>store</td>
+  <td tal:content="python:str('web_site_module/officejs_monitoring/#page=ojsm_landing&url=https://someurl/public/feeds&username=user&password=pass')"></td>
+  <td>url_parameters</td>
+</tr>
+<!-- Clean Up -->
+<tr>
+  <td>open</td>
+  <td>${base_url}/bar_module/ListBoxZuite_reset</td>
+  <td></td>
+</tr>
+<tr>
+  <td>assertTextPresent</td>
+  <td>Reset Successfully.</td>
+  <td></td>
+</tr>
+<!-- New entry point -->
+<tr>
+  <td>open</td>
+  <td>${base_url}/${url_parameters}</td>
+  <td></td>
+</tr>
+<tr>
+  <td>pause</td>
+  <td>2000</td>
+  <td></td>
+</tr>
+<tr>
+  <td>waitForElementPresent</td>
+  <td>//a[@data-i18n='Monitoring Configurations']</td>
+  <td></td>
+</tr>
+<tr>
+  <td>waitForElementPresent</td>
+  <td>//span[@data-i18n='Add OPML']</td>
+  <td></td>
+</tr>
+<tr>
+  <td>assertTextPresent</td>
+  <td>OPML URL</td>
+  <td></td>
+</tr>
+</tbody></table>
+</body>
+</html>
\ No newline at end of file

product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.StandardSecurity.py

@@ -175,7 +175,11 @@ def asSecurityGroupIdSet(category_dict, key_sort=sorted):
     except KeyError:
       continue
     for category_value, is_child_category in category_list:
-      if category_value.getPortalType() == 'Person':
+      if 'ERP5User' in getattr(
+        category_value.getTypeInfo(),
+        'getTypePropertySheetList',
+        lambda: ()
+      )():
         user_name = category_value.Person_getUserId()
         if user_name is not None:
           user_list.append(user_name)