Commit 42f37e39 authored by Romain Courteaud's avatar Romain Courteaud

[erp5_web_renderjs_ui] Use RSVP.hash

parent ab8f60f8
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
*/ */
function modifyBreadcrumbList(gadget, parent_link, breadcrumb_action_list) { function modifyBreadcrumbList(gadget, parent_link, breadcrumb_action_list) {
if (parent_link === undefined) { if (parent_link === undefined) {
return; return breadcrumb_action_list;
} }
var uri = new URI(parent_link.href), var uri = new URI(parent_link.href),
jio_key = uri.segment(2); jio_key = uri.segment(2);
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
title: "ERP5", title: "ERP5",
link: "#" link: "#"
}); });
return; return breadcrumb_action_list;
} }
// Parent is an ERP5 document // Parent is an ERP5 document
...@@ -78,77 +78,66 @@ ...@@ -78,77 +78,66 @@
.onStateChange(function () { .onStateChange(function () {
var gadget = this, var gadget = this,
view_list = [], erp5_document;
tab_list = [],
jump_action_list = [],
breadcrumb_action_list = [],
erp5_document,
tab_title = "Views",
tab_icon = "eye",
jump_list;
return gadget.jio_getAttachment(gadget.state.jio_key, "links") return gadget.jio_getAttachment(gadget.state.jio_key, "links")
.push(function (result) { .push(function (result) {
var i,
promise_list = [];
erp5_document = result; erp5_document = result;
view_list = ensureArray(erp5_document._links.view);
var i,
tab_promise_list = [],
jump_action_promise_list = [],
view_list = ensureArray(erp5_document._links.view)
.concat(ensureArray(erp5_document._links.action_object_jio_view)),
jump_list = ensureArray(erp5_document._links.action_object_jump); jump_list = ensureArray(erp5_document._links.action_object_jump);
for (i = 0; i < view_list.length; i += 1) { for (i = 0; i < view_list.length; i += 1) {
promise_list.push(gadget.getUrlFor({command: 'display_with_history', options: { tab_promise_list.push(RSVP.hash({
title: view_list[i].title,
i18n: view_list[i].title,
link: gadget.getUrlFor({command: 'display_with_history', options: {
jio_key: gadget.state.jio_key, jio_key: gadget.state.jio_key,
view: view_list[i].href, view: view_list[i].href,
page: undefined // Views in ERP5 must be forms but because of page: undefined // Views in ERP5 must be forms but because of
// OfficeJS we keep it empty for different default // OfficeJS we keep it empty for different default
}})); }})
}));
} }
for (i = 0; i < jump_list.length; i += 1) { for (i = 0; i < jump_list.length; i += 1) {
promise_list.push(gadget.getUrlFor({command: 'push_history', options: { jump_action_promise_list.push(RSVP.hash({
title: jump_list[i].title,
i18n: jump_list[i].title,
link: gadget.getUrlFor({command: 'push_history', options: {
extended_search: new URI(jump_list[i].href).query(true).query, extended_search: new URI(jump_list[i].href).query(true).query,
page: 'search' page: 'search'
}})); }})
}));
} }
promise_list.push(
modifyBreadcrumbList(gadget, return RSVP.hash({
tab_list: RSVP.all(tab_promise_list),
jump_action_list: RSVP.all(jump_action_promise_list),
breadcrumb_action_list: modifyBreadcrumbList(gadget,
erp5_document._links.parent || "#", erp5_document._links.parent || "#",
breadcrumb_action_list) [])
);
return RSVP.all(promise_list);
})
.push(function (all_result) {
var i, j;
j = 0;
for (i = 0; i < view_list.length; i += 1) {
tab_list.push({
title: view_list[i].title,
i18n: view_list[i].title,
link: all_result[j]
});
j += 1;
}
for (i = 0; i < jump_list.length; i += 1) {
jump_action_list.push({
title: jump_list[i].title,
link: all_result[j],
i18n: jump_list[i].title
}); });
j += 1; })
} .push(function (result_dict) {
return gadget.translateHtml(table_template({ return gadget.translateHtml(table_template({
definition_title: tab_title, definition_title: "Views",
definition_i18n: tab_title, definition_i18n: "Views",
definition_icon: tab_icon, definition_icon: "eye",
documentlist: tab_list documentlist: result_dict.tab_list
}) + table_template({ }) + table_template({
definition_title: "Jumps", definition_title: "Jumps",
documentlist: jump_action_list, documentlist: result_dict.jump_action_list,
definition_icon: "plane", definition_icon: "plane",
definition_i18n: "Jumps" definition_i18n: "Jumps"
}) + table_template({ }) + table_template({
definition_title: "Breadcrumb", definition_title: "Breadcrumb",
documentlist: breadcrumb_action_list, documentlist: result_dict.breadcrumb_action_list,
definition_icon: "ellipsis-v", definition_icon: "ellipsis-v",
definition_i18n: "Breadcrumb" definition_i18n: "Breadcrumb"
})); }));
...@@ -156,19 +145,13 @@ ...@@ -156,19 +145,13 @@
.push(function (my_translated_html) { .push(function (my_translated_html) {
gadget.element.innerHTML = my_translated_html; gadget.element.innerHTML = my_translated_html;
return RSVP.all([ return RSVP.hash({
gadget.getUrlFor({command: 'cancel_dialog_with_history'}), back_url: gadget.getUrlFor({command: 'cancel_dialog_with_history'}),
calculatePageTitle(gadget, erp5_document) page_title: calculatePageTitle(gadget, erp5_document)
]);
})
.push(function (url_list) {
var dict = {
back_url: url_list[0],
page_title: url_list[1]
};
return gadget.updateHeader(dict);
}); });
}) })
.push(gadget.updateHeader.bind(gadget));
})
.declareMethod("triggerSubmit", function () { .declareMethod("triggerSubmit", function () {
return; return;
}); });
......
...@@ -148,11 +148,13 @@ ...@@ -148,11 +148,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>975.28771.29128.25958</string> </value> <value> <string>980.35570.30592.53077</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -246,7 +252,7 @@ ...@@ -246,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1556782424.57</float> <float>1576591900.86</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -255,16 +261,20 @@ ...@@ -255,16 +261,20 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
</tuple> </value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
<record id="5" aka="AAAAAAAAAAU="> <record id="5" aka="AAAAAAAAAAU=">
<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>
...@@ -312,7 +322,9 @@ ...@@ -312,7 +322,9 @@
</item> </item>
</dictionary> </dictionary>
</list> </list>
</tuple> </value>
</item>
</dictionary>
</pickle> </pickle>
</record> </record>
</ZopeData> </ZopeData>
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