From 1b18c3a2b2be03667a57310d46df4909af76eb9f Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Thu, 27 Feb 2020 10:12:52 +0000
Subject: [PATCH] [erp5_core/web_renderjs_ui] jIO 3.42.0
---
.../web_page_module/rjs_jio_js.js | 8 +-
.../web_page_module/rjs_jio_js.xml | 314 +++++++++---------
.../portal_skins/erp5_core/jio.js.js | 8 +-
3 files changed, 169 insertions(+), 161 deletions(-)
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.js
index acf7946cf5..b14d5d0d82 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.js
@@ -8339,10 +8339,7 @@ return new Parser;
if (result instanceof RSVP.Queue) {
return result;
}
- return new RSVP.Queue()
- .push(function returnPushableResult() {
- return result;
- });
+ return new RSVP.Queue(result);
}
function declareMethod(klass, name, precondition_function, post_function) {
@@ -13425,7 +13422,8 @@ return new Parser;
function extractPropertyFromFormJSON(json) {
var form = json._embedded._view,
converted_json = {
- portal_type: json._links.type.name
+ portal_type: new URI(json._links.type.href).segment(2)
+ .replace("portal_types/", "")
},
form_data_json = {},
field,
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml
index c01634c5a3..9226c3c40c 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml
@@ -154,171 +154,183 @@
</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/>
- <list>
- <dictionary>
- <item>
- <key> <string>action</string> </key>
- <value> <string>publish_alive</string> </value>
- </item>
- <item>
- <key> <string>actor</string> </key>
- <value> <string>cedric.le.ninivin</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>time</string> </key>
- <value>
- <object>
- <klass>
- <global name="DateTime" module="DateTime.DateTime"/>
- </klass>
- <tuple>
- <none/>
- </tuple>
- <state>
- <tuple>
- <float>1439486598.76</float>
- <string>UTC</string>
- </tuple>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>validation_state</string> </key>
- <value> <string>published_alive</string> </value>
- </item>
- </dictionary>
- </list>
- </tuple>
+ <dictionary>
+ <item>
+ <key> <string>_log</string> </key>
+ <value>
+ <list>
+ <dictionary>
+ <item>
+ <key> <string>action</string> </key>
+ <value> <string>publish_alive</string> </value>
+ </item>
+ <item>
+ <key> <string>actor</string> </key>
+ <value> <string>cedric.le.ninivin</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>time</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="DateTime" module="DateTime.DateTime"/>
+ </klass>
+ <tuple>
+ <none/>
+ </tuple>
+ <state>
+ <tuple>
+ <float>1439486598.76</float>
+ <string>UTC</string>
+ </tuple>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>validation_state</string> </key>
+ <value> <string>published_alive</string> </value>
+ </item>
+ </dictionary>
+ </list>
+ </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/>
- <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>978.62837.20685.9437</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>1570708759.13</float>
- <string>UTC</string>
- </tuple>
- </state>
- </object>
- </value>
- </item>
- </dictionary>
- </list>
- </tuple>
+ <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>979.21897.21030.48025</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>1582798404.51</float>
+ <string>UTC</string>
+ </tuple>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ </list>
+ </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/>
- <list>
- <dictionary>
- <item>
- <key> <string>action</string> </key>
- <value> <string>detect_converted_file</string> </value>
- </item>
- <item>
- <key> <string>actor</string> </key>
- <value> <string>cedric.le.ninivin</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>1439486581.3</float>
- <string>UTC</string>
- </tuple>
- </state>
- </object>
- </value>
- </item>
- </dictionary>
- </list>
- </tuple>
+ <dictionary>
+ <item>
+ <key> <string>_log</string> </key>
+ <value>
+ <list>
+ <dictionary>
+ <item>
+ <key> <string>action</string> </key>
+ <value> <string>detect_converted_file</string> </value>
+ </item>
+ <item>
+ <key> <string>actor</string> </key>
+ <value> <string>cedric.le.ninivin</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>1439486581.3</float>
+ <string>UTC</string>
+ </tuple>
+ </state>
+ </object>
+ </value>
+ </item>
+ </dictionary>
+ </list>
+ </value>
+ </item>
+ </dictionary>
</pickle>
</record>
</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js
index acf7946cf5..b14d5d0d82 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js
@@ -8339,10 +8339,7 @@ return new Parser;
if (result instanceof RSVP.Queue) {
return result;
}
- return new RSVP.Queue()
- .push(function returnPushableResult() {
- return result;
- });
+ return new RSVP.Queue(result);
}
function declareMethod(klass, name, precondition_function, post_function) {
@@ -13425,7 +13422,8 @@ return new Parser;
function extractPropertyFromFormJSON(json) {
var form = json._embedded._view,
converted_json = {
- portal_type: json._links.type.name
+ portal_type: new URI(json._links.type.href).segment(2)
+ .replace("portal_types/", "")
},
form_data_json = {},
field,
--
2.30.9