Skip to content

S
slapos.core
Commit 0e770859 authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

General update for frontend Selector 

See merge request nexedi/slapos.core!517
parents 71a5bf71 61cd2a8c
Pipeline #27689 failed with stage
    in 0 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 493 additions and 382 deletions
    master/bt5/slapos_web_frontend_selector/PathTemplateItem/web_page_module/slapos-frontend-selector-cdn-gadget-html.xml
    View file @ 0e770859
    ...@@ -144,11 +144,13 @@ ...@@ -144,11 +144,13 @@
    </record> </record>
    <record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
    <pickle> <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle> </pickle>
    <pickle> <pickle>
    <tuple> <dictionary>
    <none/> <item>
    <key> <string>_log</string> </key>
    <value>
    <list> <list>
    <dictionary> <dictionary>
    <item> <item>
    ...@@ -194,7 +196,9 @@ ...@@ -194,7 +196,9 @@
    </item> </item>
    </dictionary> </dictionary>
    </list> </list>
    </tuple> </value>
    </item>
    </dictionary>
    </pickle> </pickle>
    </record> </record>
    </ZopeData> </ZopeData>
    master/bt5/slapos_web_frontend_selector/PathTemplateItem/web_page_module/slapos-frontend-selector-cdn-gadget-js.js
    View file @ 0e770859
    ...@@ -6,32 +6,32 @@ ...@@ -6,32 +6,32 @@
    relative_url_path = "/app", relative_url_path = "/app",
    test_url_list = [ test_url_list = [
    { name : 'Europe 1', { name : 'Europe 1',
    testurl: "http://demoapp-eu1.erp5.cn/WebSite_getTestFrontendResponse", testurl: "https://demoapp-eu1.erp5.cn/WebSite_getTestFrontendResponse",
    redirect: "http://demoapp-eu1.erp5.cn" + relative_url_path }, redirect: "https://demoapp-eu1.erp5.cn" + relative_url_path },
    { name : 'Europe 2', { name : 'Europe 2',
    testurl: "http://demoapp-eu1.erp5.cn/WebSite_getTestFrontendResponse", testurl: "https://demoapp-eu1.erp5.cn/WebSite_getTestFrontendResponse",
    redirect: "http://demoapp-eu2.erp5.cn" + relative_url_path }, redirect: "https://demoapp-eu2.erp5.cn" + relative_url_path },
    { name : 'North America 1', { name : 'North America 1',
    testurl: "http://demoapp-na1.erp5.cn/WebSite_getTestFrontendResponse", testurl: "https://demoapp-na1.erp5.cn/WebSite_getTestFrontendResponse",
    redirect: "http://demoapp-na1.erp5.cn" + relative_url_path }, redirect: "https://demoapp-na1.erp5.cn" + relative_url_path },
    { name : 'North America 2', { name : 'North America 2',
    testurl: "http://demoapp-na2.erp5.cn/WebSite_getTestFrontendResponse", testurl: "https://demoapp-na2.erp5.cn/WebSite_getTestFrontendResponse",
    redirect: "http://demoapp-na2.erp5.cn" + relative_url_path }, redirect: "https://demoapp-na2.erp5.cn" + relative_url_path },
    { name : 'China CT', { name : 'China CT',
    testurl: "http://demoapp-ct1.erp5.cn/WebSite_getTestFrontendResponse", testurl: "https://demoapp-ct1.erp5.cn/WebSite_getTestFrontendResponse",
    redirect: "http://demoapp-ct1.erp5.cn" + relative_url_path }, redirect: "https://demoapp-ct1.erp5.cn" + relative_url_path },
    { name : 'China CU', { name : 'China CU',
    testurl: "http://demoapp-cu1.erp5.cn/WebSite_getTestFrontendResponse", testurl: "https://demoapp-cu1.erp5.cn/WebSite_getTestFrontendResponse",
    redirect: "http://demoapp-cu1.erp5.cn" + relative_url_path }, redirect: "https://demoapp-cu1.erp5.cn" + relative_url_path },
    { name : 'China CM', { name : 'China CM',
    testurl: "http://demoapp-cm1.erp5.cn/WebSite_getTestFrontendResponse", testurl: "https://demoapp-cm1.erp5.cn/WebSite_getTestFrontendResponse",
    redirect: "http://demoapp-cm1.erp5.cn" + relative_url_path }, redirect: "https://demoapp-cm1.erp5.cn" + relative_url_path },
    { name : 'Asia 1', { name : 'Asia 1',
    testurl: "http://demoapp-as1.erp5.cn/WebSite_getTestFrontendResponse", testurl: "https://demoapp-as1.erp5.cn/WebSite_getTestFrontendResponse",
    redirect: "http://demoapp-as1.erp5.cn" + relative_url_path }, redirect: "https://demoapp-as1.erp5.cn" + relative_url_path },
    { name : 'Asia 2', { name : 'Asia 2',
    testurl: "http://demoapp-as2.erp5.cn/WebSite_getTestFrontendResponse", testurl: "https://demoapp-as2.erp5.cn/WebSite_getTestFrontendResponse",
    redirect: "http://demoapp-as2.erp5.cn" + relative_url_path } redirect: "https://demoapp-as2.erp5.cn" + relative_url_path }
    ]; ];
    function ajax(param) { function ajax(param) {
    ......
    master/bt5/slapos_web_frontend_selector/PathTemplateItem/web_page_module/slapos-frontend-selector-cdn-gadget-js.xml
    View file @ 0e770859
    ...@@ -146,11 +146,13 @@ ...@@ -146,11 +146,13 @@
    </record> </record>
    <record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
    <pickle> <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle> </pickle>
    <pickle> <pickle>
    <tuple> <dictionary>
    <none/> <item>
    <key> <string>_log</string> </key>
    <value>
    <list> <list>
    <dictionary> <dictionary>
    <item> <item>
    ...@@ -196,16 +198,20 @@ ...@@ -196,16 +198,20 @@
    </item> </item>
    </dictionary> </dictionary>
    </list> </list>
    </tuple> </value>
    </item>
    </dictionary>
    </pickle> </pickle>
    </record> </record>
    <record id="4" aka="AAAAAAAAAAQ="> <record id="4" aka="AAAAAAAAAAQ=">
    <pickle> <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle> </pickle>
    <pickle> <pickle>
    <tuple> <dictionary>
    <none/> <item>
    <key> <string>_log</string> </key>
    <value>
    <list> <list>
    <dictionary> <dictionary>
    <item> <item>
    ...@@ -228,7 +234,7 @@ ...@@ -228,7 +234,7 @@
    </item> </item>
    <item> <item>
    <key> <string>serial</string> </key> <key> <string>serial</string> </key>
    <value> <string>976.42511.63989.11229</string> </value> <value> <string>1007.46143.36434.62122</string> </value>
    </item> </item>
    <item> <item>
    <key> <string>state</string> </key> <key> <string>state</string> </key>
    ...@@ -248,7 +254,7 @@ ...@@ -248,7 +254,7 @@
    </tuple> </tuple>
    <state> <state>
    <tuple> <tuple>
    <float>1561539709.69</float> <float>1681410019.96</float>
    <string>UTC</string> <string>UTC</string>
    </tuple> </tuple>
    </state> </state>
    ...@@ -257,7 +263,9 @@ ...@@ -257,7 +263,9 @@
    </item> </item>
    </dictionary> </dictionary>
    </list> </list>
    </tuple> </value>
    </item>
    </dictionary>
    </pickle> </pickle>
    </record> </record>
    </ZopeData> </ZopeData>
    master/bt5/slapos_web_frontend_selector/PathTemplateItem/web_page_module/slapos-frontend-selector-demoapp.xml
    View file @ 0e770859
    ...@@ -140,11 +140,13 @@ ...@@ -140,11 +140,13 @@
    </record> </record>
    <record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
    <pickle> <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle> </pickle>
    <pickle> <pickle>
    <tuple> <dictionary>
    <none/> <item>
    <key> <string>_log</string> </key>
    <value>
    <list> <list>
    <dictionary> <dictionary>
    <item> <item>
    ...@@ -190,7 +192,9 @@ ...@@ -190,7 +192,9 @@
    </item> </item>
    </dictionary> </dictionary>
    </list> </list>
    </tuple> </value>
    </item>
    </dictionary>
    </pickle> </pickle>
    </record> </record>
    </ZopeData> </ZopeData>
    master/bt5/slapos_web_frontend_selector/PathTemplateItem/web_page_module/slapos-frontend-selector-initial-page.html
    View file @ 0e770859
    <p>Please access <a href="http://demoapp.node.grandenet.cn">demoapp.node.grandenet.cn </a></p> <p>Please access <a href="./demo">demo</a></p>
    \ No newline at end of file \ No newline at end of file
    master/bt5/slapos_web_frontend_selector/PathTemplateItem/web_page_module/slapos-frontend-selector-initial-page.xml
    View file @ 0e770859
    ...@@ -132,6 +132,12 @@ ...@@ -132,6 +132,12 @@
    <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
    </value> </value>
    </item> </item>
    <item>
    <key> <string>edit_workflow</string> </key>
    <value>
    <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
    </value>
    </item>
    </dictionary> </dictionary>
    </value> </value>
    </item> </item>
    ...@@ -140,11 +146,13 @@ ...@@ -140,11 +146,13 @@
    </record> </record>
    <record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
    <pickle> <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle> </pickle>
    <pickle> <pickle>
    <tuple> <dictionary>
    <none/> <item>
    <key> <string>_log</string> </key>
    <value>
    <list> <list>
    <dictionary> <dictionary>
    <item> <item>
    ...@@ -190,7 +198,74 @@ ...@@ -190,7 +198,74 @@
    </item> </item>
    </dictionary> </dictionary>
    </list> </list>
    </value>
    </item>
    </dictionary>
    </pickle>
    </record>
    <record id="4" aka="AAAAAAAAAAQ=">
    <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle>
    <pickle>
    <dictionary>
    <item>
    <key> <string>_log</string> </key>
    <value>
    <list>
    <dictionary>
    <item>
    <key> <string>action</string> </key>
    <value> <string>edit</string> </value>
    </item>
    <item>
    <key> <string>actor</string> </key>
    <value> <string>zope</string> </value>
    </item>
    <item>
    <key> <string>comment</string> </key>
    <value>
    <none/>
    </value>
    </item>
    <item>
    <key> <string>error_message</string> </key>
    <value> <string></string> </value>
    </item>
    <item>
    <key> <string>serial</string> </key>
    <value> <string>1007.46172.20739.40328</string> </value>
    </item>
    <item>
    <key> <string>state</string> </key>
    <value> <string>current</string> </value>
    </item>
    <item>
    <key> <string>time</string> </key>
    <value>
    <object>
    <klass>
    <global name="_reconstructor" module="copy_reg"/>
    </klass>
    <tuple>
    <global name="DateTime" module="DateTime.DateTime"/>
    <global name="object" module="__builtin__"/>
    <none/>
    </tuple>
    <state>
    <tuple>
    <float>1681409796.97</float>
    <string>UTC</string>
    </tuple> </tuple>
    </state>
    </object>
    </value>
    </item>
    </dictionary>
    </list>
    </value>
    </item>
    </dictionary>
    </pickle> </pickle>
    </record> </record>
    </ZopeData> </ZopeData>
    master/bt5/slapos_web_frontend_selector/PathTemplateItem/web_site_module/customer_frontend_selector.xml
    View file @ 0e770859
    ...@@ -93,9 +93,13 @@ ...@@ -93,9 +93,13 @@
    <value> <value>
    <object> <object>
    <klass> <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/> <global name="_reconstructor" module="copy_reg"/>
    </klass> </klass>
    <tuple/> <tuple>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    <global name="object" module="__builtin__"/>
    <none/>
    </tuple>
    <state> <state>
    <dictionary> <dictionary>
    <item> <item>
    ...@@ -375,11 +379,13 @@ ...@@ -375,11 +379,13 @@
    </record> </record>
    <record id="9" aka="AAAAAAAAAAk="> <record id="9" aka="AAAAAAAAAAk=">
    <pickle> <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle> </pickle>
    <pickle> <pickle>
    <tuple> <dictionary>
    <none/> <item>
    <key> <string>_log</string> </key>
    <value>
    <list> <list>
    <dictionary> <dictionary>
    <item> <item>
    ...@@ -425,16 +431,20 @@ ...@@ -425,16 +431,20 @@
    </item> </item>
    </dictionary> </dictionary>
    </list> </list>
    </tuple> </value>
    </item>
    </dictionary>
    </pickle> </pickle>
    </record> </record>
    <record id="10" aka="AAAAAAAAAAo="> <record id="10" aka="AAAAAAAAAAo=">
    <pickle> <pickle>
    <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
    </pickle> </pickle>
    <pickle> <pickle>
    <tuple> <dictionary>
    <none/> <item>
    <key> <string>_log</string> </key>
    <value>
    <list> <list>
    <dictionary> <dictionary>
    <item> <item>
    ...@@ -486,7 +496,9 @@ ...@@ -486,7 +496,9 @@
    </item> </item>
    </dictionary> </dictionary>
    </list> </list>
    </tuple> </value>
    </item>
    </dictionary>
    </pickle> </pickle>
    </record> </record>
    </ZopeData> </ZopeData>
    master/bt5/slapos_web_frontend_selector/PathTemplateItem/web_site_module/customer_frontend_selector/demo.xml
    View file @ 0e770859
    ...@@ -58,9 +58,13 @@ ...@@ -58,9 +58,13 @@
    <value> <value>
    <object> <object>
    <klass> <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/> <global name="_reconstructor" module="copy_reg"/>
    </klass> </klass>
    <tuple/> <tuple>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    <global name="object" module="__builtin__"/>
    <none/>
    </tuple>
    <state> <state>
    <dictionary> <dictionary>
    <item> <item>
    ......
    master/bt5/slapos_web_frontend_selector/PathTemplateItem/web_site_module/customer_frontend_selector/demo/app.xml
    View file @ 0e770859
    ...@@ -58,9 +58,13 @@ ...@@ -58,9 +58,13 @@
    <value> <value>
    <object> <object>
    <klass> <klass>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/> <global name="_reconstructor" module="copy_reg"/>
    </klass> </klass>
    <tuple/> <tuple>
    <global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
    <global name="object" module="__builtin__"/>
    <none/>
    </tuple>
    <state> <state>
    <dictionary> <dictionary>
    <item> <item>
    ......
    master/bt5/slapos_web_frontend_selector/SkinTemplateItem/portal_skins/slapos_frontend_selector_theme/WebSite_getTestFrontendResponse.py
    View file @ 0e770859
    ...@@ -13,7 +13,7 @@ response.setHeader('Content-Type', 'text/plain') ...@@ -13,7 +13,7 @@ response.setHeader('Content-Type', 'text/plain')
    response.setHeader("Content-Security-Policy", "default-src 'none'; img-src 'self' data:; media-src 'self'; connect-src 'self' mail.tiolive.com *.erp5.cn; script-src 'self' 'unsafe-eval'; font-src netdna.bootstrapcdn.com; style-src 'self' netdna.bootstrapcdn.com 'unsafe-inline' data:; frame-src 'self' data:") response.setHeader("Content-Security-Policy", "default-src 'none'; img-src 'self' data:; media-src 'self'; connect-src 'self' mail.tiolive.com *.erp5.cn; script-src 'self' 'unsafe-eval'; font-src netdna.bootstrapcdn.com; style-src 'self' netdna.bootstrapcdn.com 'unsafe-inline' data:; frame-src 'self' data:")
    response.setHeader("Access-Control-Allow-Origin", "http://demoapp.node.grandenet.cn") response.setHeader("Access-Control-Allow-Origin", "https://selector.node.grandenet.cn")
    return """ return """
    ################################################################################### ###################################################################################
    ......
    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