Skip to content

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

Revert controller and invoice page 

See merge request nexedi/slapos.core!240
parents 2da50130 9362a190
Show whitespace changes
Inline Side-by-side
Showing with 440 additions and 182 deletions
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_controller_js.js
View file @ e0817d60
......@@ -69,20 +69,9 @@
} else if ((result.portal_type === "Organisation") &&
result.role === "host") {
child_gadget_url = "gadget_erp5_page_slap_site_view.html";
} else if ((result.portal_type === "组织") &&
result.role === "host") {
child_gadget_url = "gadget_erp5_page_slap_site_view.html";
} else if (result.portal_type === "ERP5 Login") {
child_gadget_url = 'gadget_erp5_page_slap_' +
result.portal_type.replace(/ /g, '_').toLowerCase() +
'_view.html';
} else if (result.portal_type === "access_denied") {
child_gadget_url = 'gadget_erp5_page_slap_' +
result.portal_type.replace(/ /g, '_').toLowerCase() +
'_view.html';
} else if (result.portal_type !== undefined) {
child_gadget_url = 'gadget_erp5_page_slap_' +
result.parent_relative_url.replace(/_module/g, '').toLowerCase() +
result.portal_type.replace(/ /g, '_').toLowerCase() +
'_view.html';
} else {
throw new Error('Can not display document: ' + options.jio_key);
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_controller_js.xml
View file @ e0817d60
......@@ -150,11 +150,13 @@
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
<pickle>
<tuple>
<none/>
<dictionary>
<item>
<key> <string>_log</string> </key>
<value>
<list>
<dictionary>
<item>
......@@ -198,17 +200,20 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
<pickle>
<tuple>
<none/>
<dictionary>
<item>
<key> <string>_log</string> </key>
<value>
<list>
<dictionary>
<item>
......@@ -231,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>983.16079.39534.2440</string> </value>
<value> <string>984.46206.41215.7833</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -249,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1587053604.03</float>
<float>1593694959.39</float>
<string>UTC</string>
</tuple>
</state>
......@@ -258,17 +263,20 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
<pickle>
<tuple>
<none/>
<dictionary>
<item>
<key> <string>_log</string> </key>
<value>
<list>
<dictionary>
<item>
......@@ -316,8 +324,9 @@
</item>
</dictionary>
</list>
<none/>
</tuple>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_accounting_view_html.html → master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_html.html
View file @ e0817d60
......@@ -21,7 +21,7 @@
<script src="renderjs.js" type="text/javascript"></script>
<!-- custom script -->
<script src="gadget_erp5_page_slap_accounting_view.js" type="text/javascript"></script>
<script src="gadget_erp5_page_slap_sale_invoice_transaction_view.js" type="text/javascript"></script>
</head>
<body>
......
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_accounting_view_html.xml → master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_html.xml
View file @ e0817d60
......@@ -16,6 +16,7 @@
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -58,6 +59,7 @@
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -73,7 +75,7 @@
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>gadget_erp5_page_slap_accounting_view.html</string> </value>
<value> <string>gadget_erp5_page_slap_sale_invoice_transaction_view.html</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -83,7 +85,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>rjs_gadget_erp5_page_slap_accounting_view_html</string> </value>
<value> <string>rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_html</string> </value>
</item>
<item>
<key> <string>language</string> </key>
......@@ -101,7 +103,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Gadget SlapOS Accounting View</string> </value>
<value> <string>Gadget SlapOS Sale Invoice Transaction View</string> </value>
</item>
<item>
<key> <string>version</string> </key>
......@@ -132,6 +134,18 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>processing_status_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
......@@ -175,7 +189,7 @@
</tuple>
<state>
<tuple>
<float>1593311514.96</float>
<float>1516641727.65</float>
<string>UTC</string>
</tuple>
</state>
......@@ -192,4 +206,122 @@
</tuple>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<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>982.20866.750.15718</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="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1583401103.11</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>detect_converted_file</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_processing_state</string> </key>
<value> <string>converted</string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>0.0.0.0</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1516641498.28</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_accounting_view_js.xml → master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_js.xml
View file @ e0817d60
......@@ -16,6 +16,7 @@
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -58,6 +59,7 @@
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
......@@ -69,7 +71,7 @@
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>gadget_erp5_page_slap_accounting_view.js</string> </value>
<value> <string>gadget_erp5_page_slap_sale_invoice_transaction_view.js</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -79,7 +81,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>rjs_gadget_erp5_page_slap_accounting_view_js</string> </value>
<value> <string>rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_js</string> </value>
</item>
<item>
<key> <string>language</string> </key>
......@@ -97,7 +99,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Gadget SlapOS Accounting View</string> </value>
<value> <string>Gadget SlapOS Sale Invoice Transaction View</string> </value>
</item>
<item>
<key> <string>version</string> </key>
......@@ -128,6 +130,18 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>processing_status_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
......@@ -171,7 +185,7 @@
</tuple>
<state>
<tuple>
<float>1593311505.56</float>
<float>1516642548.81</float>
<string>UTC</string>
</tuple>
</state>
......@@ -188,4 +202,122 @@
</tuple>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<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>982.32516.46874.3959</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="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1584106716.12</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>detect_converted_file</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_processing_state</string> </key>
<value> <string>converted</string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>0.0.0.0</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1516641773.94</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
<none/>
</tuple>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/WebSection_getHostingJSPrecacheManifestList.py
View file @ e0817d60
......@@ -33,8 +33,6 @@ url_list = [
"gadget_erp5_page_slap_add_software_installation.js",
"gadget_erp5_page_slap_add_ticket.html",
"gadget_erp5_page_slap_add_ticket.js",
"gadget_erp5_page_slap_accounting_view.html",
"gadget_erp5_page_slap_accounting_view.js",
"gadget_erp5_page_slap_close_ticket.js",
"gadget_erp5_page_slap_close_ticket.html",
"gadget_erp5_page_slap_computer_get_token.html",
......
master/bt5/slapos_jio/bt/template_keep_last_workflow_history_only_path_list
View file @ e0817d60
......@@ -206,5 +206,3 @@ web_page_module/rjs_tv4_min_js
web_page_module/rjs_vkbeautify_js
web_site_module/hostingjs
web_site_module/hostingjs/**
\ No newline at end of file
web_page_module/rjs_gadget_erp5_page_slap_accounting_view_html
web_page_module/rjs_gadget_erp5_page_slap_accounting_view_js
\ No newline at end of file
master/bt5/slapos_jio/bt/template_path_list
View file @ e0817d60
......@@ -12,8 +12,6 @@ web_page_module/rjs_gadget_erp5_page_slap_accept_upgrade_decision_html
web_page_module/rjs_gadget_erp5_page_slap_accept_upgrade_decision_js
web_page_module/rjs_gadget_erp5_page_slap_access_denied_view_html
web_page_module/rjs_gadget_erp5_page_slap_access_denied_view_js
web_page_module/rjs_gadget_erp5_page_slap_accounting_view_html
web_page_module/rjs_gadget_erp5_page_slap_accounting_view_js
web_page_module/rjs_gadget_erp5_page_slap_add_computer_html
web_page_module/rjs_gadget_erp5_page_slap_add_computer_js
web_page_module/rjs_gadget_erp5_page_slap_add_hosting_subscription_html
......@@ -114,6 +112,8 @@ web_page_module/rjs_gadget_erp5_page_slap_rss_critical_ticket_html
web_page_module/rjs_gadget_erp5_page_slap_rss_critical_ticket_js
web_page_module/rjs_gadget_erp5_page_slap_rss_ticket_html
web_page_module/rjs_gadget_erp5_page_slap_rss_ticket_js
web_page_module/rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_html
web_page_module/rjs_gadget_erp5_page_slap_sale_invoice_transaction_view_js
web_page_module/rjs_gadget_erp5_page_slap_select_software_product_html
web_page_module/rjs_gadget_erp5_page_slap_select_software_product_js
web_page_module/rjs_gadget_erp5_page_slap_select_software_release_html
......
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