Skip to content

erp5
erp5
Commit c06984f0 authored by Roque's avatar Roque
Browse files
Options

Fix monitoring landing 

See merge request !2028
parents 8eaceae0 fe2078a1
Pipeline #38645 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 19 additions and 11 deletions
    bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bootloader_js.js
    View file @ c06984f0
    ...@@ -104,6 +104,14 @@ var repair = false; ...@@ -104,6 +104,14 @@ var repair = false;
    '#page=settings_configurator', '#page=settings_configurator',
    '#/?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
    View file @ c06984f0
    ...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
    </item> </item>
    <item> <item>
    <key> <string>actor</string> </key> <key> <string>actor</string> </key>
    <value> <string>zope</string> </value> <value> <unicode>zope</unicode> </value>
    </item> </item>
    <item> <item>
    <key> <string>comment</string> </key> <key> <string>comment</string> </key>
    ...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
    </item> </item>
    <item> <item>
    <key> <string>serial</string> </key> <key> <string>serial</string> </key>
    <value> <string>996.26493.30077.17766</string> </value> <value> <string>1021.28560.35460.52275</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>state</string> </key> <key> <string>state</string> </key>
    ...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
    </tuple> </tuple>
    <state> <state>
    <tuple> <tuple>
    <float>1637925065.64</float> <float>1734538594.95</float>
    <string>UTC</string> <string>UTC</string>
    </tuple> </tuple>
    </state> </state>
    ......
    bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring.xml
    View file @ c06984f0
    ...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
    <dictionary> <dictionary>
    <item> <item>
    <key> <string>_defined_in_class</string> </key> <key> <string>_defined_in_class</string> </key>
    <value> <bool>True</bool> </value> <value> <int>1</int> </value>
    </item> </item>
    <item> <item>
    <key> <string>_hookname</string> </key> <key> <string>_hookname</string> </key>
    ...@@ -544,7 +544,7 @@ ...@@ -544,7 +544,7 @@
    </item> </item>
    <item> <item>
    <key> <string>serial</string> </key> <key> <string>serial</string> </key>
    <value> <string>1019.37281.47800.48247</string> </value> <value> <string>1020.20655.56844.35481</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>state</string> </key> <key> <string>state</string> </key>
    ...@@ -564,7 +564,7 @@ ...@@ -564,7 +564,7 @@
    </tuple> </tuple>
    <state> <state>
    <tuple> <tuple>
    <float>1730218552.03</float> <float>1734537516.03</float>
    <string>UTC</string> <string>UTC</string>
    </tuple> </tuple>
    </state> </state>
    ......
    bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring/app.xml
    View file @ c06984f0
    ...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
    <dictionary> <dictionary>
    <item> <item>
    <key> <string>_defined_in_class</string> </key> <key> <string>_defined_in_class</string> </key>
    <value> <bool>True</bool> </value> <value> <int>1</int> </value>
    </item> </item>
    <item> <item>
    <key> <string>_hookname</string> </key> <key> <string>_hookname</string> </key>
    ...@@ -579,7 +579,7 @@ WebSection_getMonitorPrecacheManifestList</string> </value> ...@@ -579,7 +579,7 @@ WebSection_getMonitorPrecacheManifestList</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>serial</string> </key> <key> <string>serial</string> </key>
    <value> <string>1019.37281.53022.31078</string> </value> <value> <string>1020.20655.61313.64494</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>state</string> </key> <key> <string>state</string> </key>
    ...@@ -599,7 +599,7 @@ WebSection_getMonitorPrecacheManifestList</string> </value> ...@@ -599,7 +599,7 @@ WebSection_getMonitorPrecacheManifestList</string> </value>
    </tuple> </tuple>
    <state> <state>
    <tuple> <tuple>
    <float>1730218556.13</float> <float>1734537516.03</float>
    <string>UTC</string> <string>UTC</string>
    </tuple> </tuple>
    </state> </state>
    ......
    bt5/erp5_web_monitoring/PathTemplateItem/web_site_module/officejs_monitoring/hateoas_appcache.xml
    View file @ c06984f0
    ...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
    <dictionary> <dictionary>
    <item> <item>
    <key> <string>_defined_in_class</string> </key> <key> <string>_defined_in_class</string> </key>
    <value> <bool>True</bool> </value> <value> <int>1</int> </value>
    </item> </item>
    <item> <item>
    <key> <string>_hookname</string> </key> <key> <string>_hookname</string> </key>
    ...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
    </tuple> </tuple>
    <state> <state>
    <tuple> <tuple>
    <float>1730218552.03</float> <float>1734537516.03</float>
    <string>UTC</string> <string>UTC</string>
    </tuple> </tuple>
    </state> </state>
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7