Skip to content

erp5
erp5
Commit a6e66395 authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

Revert "[erp5_web_renderjs_ui] Use RSVP.hash" 

This reverts commit 42f37e39.
parent dd04e44e
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 210 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.js
View file @ a6e66395
...@@ -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 breadcrumb_action_list; return;
} }
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 breadcrumb_action_list; return;
} }
// Parent is an ERP5 document // Parent is an ERP5 document
...@@ -78,66 +78,77 @@ ...@@ -78,66 +78,77 @@
.onStateChange(function () { .onStateChange(function () {
var gadget = this, var gadget = this,
erp5_document; view_list = [],
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) {
erp5_document = result;
var i, var i,
tab_promise_list = [], promise_list = [];
jump_action_promise_list = [], erp5_document = result;
view_list = ensureArray(erp5_document._links.view) 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) {
tab_promise_list.push(RSVP.hash({ promise_list.push(gadget.getUrlFor({command: 'display_with_history', options: {
jio_key: gadget.state.jio_key,
view: view_list[i].href,
page: undefined // Views in ERP5 must be forms but because of
// OfficeJS we keep it empty for different default
}}));
}
for (i = 0; i < jump_list.length; i += 1) {
promise_list.push(gadget.getUrlFor({command: 'push_history', options: {
extended_search: new URI(jump_list[i].href).query(true).query,
page: 'search'
}}));
}
promise_list.push(
modifyBreadcrumbList(gadget,
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, title: view_list[i].title,
i18n: view_list[i].title, i18n: view_list[i].title,
link: gadget.getUrlFor({command: 'display_with_history', options: { link: all_result[j]
jio_key: gadget.state.jio_key, });
view: view_list[i].href, j += 1;
page: undefined // Views in ERP5 must be forms but because of
// 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) {
jump_action_promise_list.push(RSVP.hash({ jump_action_list.push({
title: jump_list[i].title, title: jump_list[i].title,
i18n: jump_list[i].title, link: all_result[j],
link: gadget.getUrlFor({command: 'push_history', options: { i18n: jump_list[i].title
extended_search: new URI(jump_list[i].href).query(true).query, });
page: 'search' j += 1;
}})
}));
} }
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 || "#",
[])
});
})
.push(function (result_dict) {
return gadget.translateHtml(table_template({ return gadget.translateHtml(table_template({
definition_title: "Views", definition_title: tab_title,
definition_i18n: "Views", definition_i18n: tab_title,
definition_icon: "eye", definition_icon: tab_icon,
documentlist: result_dict.tab_list documentlist: tab_list
}) + table_template({ }) + table_template({
definition_title: "Jumps", definition_title: "Jumps",
documentlist: result_dict.jump_action_list, documentlist: 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: result_dict.breadcrumb_action_list, documentlist: breadcrumb_action_list,
definition_icon: "ellipsis-v", definition_icon: "ellipsis-v",
definition_i18n: "Breadcrumb" definition_i18n: "Breadcrumb"
})); }));
...@@ -145,12 +156,18 @@ ...@@ -145,12 +156,18 @@
.push(function (my_translated_html) { .push(function (my_translated_html) {
gadget.element.innerHTML = my_translated_html; gadget.element.innerHTML = my_translated_html;
return RSVP.hash({ return RSVP.all([
back_url: gadget.getUrlFor({command: 'cancel_dialog_with_history'}), gadget.getUrlFor({command: 'cancel_dialog_with_history'}),
page_title: calculatePageTitle(gadget, erp5_document) calculatePageTitle(gadget, erp5_document)
}); ]);
}) })
.push(gadget.updateHeader.bind(gadget)); .push(function (url_list) {
var dict = {
back_url: url_list[0],
page_title: url_list[1]
};
return gadget.updateHeader(dict);
});
}) })
.declareMethod("triggerSubmit", function () { .declareMethod("triggerSubmit", function () {
return; return;
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_tabpage_js.xml
View file @ a6e66395
...@@ -148,183 +148,171 @@ ...@@ -148,183 +148,171 @@
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <tuple>
<item> <none/>
<key> <string>_log</string> </key> <list>
<value> <dictionary>
<list> <item>
<dictionary> <key> <string>action</string> </key>
<item> <value> <string>publish_alive</string> </value>
<key> <string>action</string> </key> </item>
<value> <string>publish_alive</string> </value> <item>
</item> <key> <string>actor</string> </key>
<item> <value> <string>romain</string> </value>
<key> <string>actor</string> </key> </item>
<value> <string>romain</string> </value> <item>
</item> <key> <string>comment</string> </key>
<item> <value> <string></string> </value>
<key> <string>comment</string> </key> </item>
<value> <string></string> </value> <item>
</item> <key> <string>error_message</string> </key>
<item> <value> <string></string> </value>
<key> <string>error_message</string> </key> </item>
<value> <string></string> </value> <item>
</item> <key> <string>time</string> </key>
<item> <value>
<key> <string>time</string> </key> <object>
<value> <klass>
<object> <global name="DateTime" module="DateTime.DateTime"/>
<klass> </klass>
<global name="DateTime" module="DateTime.DateTime"/> <tuple>
</klass> <none/>
<tuple> </tuple>
<none/> <state>
</tuple> <tuple>
<state> <float>1411723496.44</float>
<tuple> <string>GMT</string>
<float>1411723496.44</float> </tuple>
<string>GMT</string> </state>
</tuple> </object>
</state> </value>
</object> </item>
</value> <item>
</item> <key> <string>validation_state</string> </key>
<item> <value> <string>published_alive</string> </value>
<key> <string>validation_state</string> </key> </item>
<value> <string>published_alive</string> </value> </dictionary>
</item> </list>
</dictionary> </tuple>
</list>
</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.Workflow"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <tuple>
<item> <none/>
<key> <string>_log</string> </key> <list>
<value> <dictionary>
<list> <item>
<dictionary> <key> <string>action</string> </key>
<item> <value> <string>edit</string> </value>
<key> <string>action</string> </key> </item>
<value> <string>edit</string> </value> <item>
</item> <key> <string>actor</string> </key>
<item> <value> <string>zope</string> </value>
<key> <string>actor</string> </key> </item>
<value> <string>zope</string> </value> <item>
</item> <key> <string>comment</string> </key>
<item> <value>
<key> <string>comment</string> </key> <none/>
<value> </value>
<none/> </item>
</value> <item>
</item> <key> <string>error_message</string> </key>
<item> <value> <string></string> </value>
<key> <string>error_message</string> </key> </item>
<value> <string></string> </value> <item>
</item> <key> <string>serial</string> </key>
<item> <value> <string>975.28771.29128.25958</string> </value>
<key> <string>serial</string> </key> </item>
<value> <string>980.35570.30592.53077</string> </value> <item>
</item> <key> <string>state</string> </key>
<item> <value> <string>current</string> </value>
<key> <string>state</string> </key> </item>
<value> <string>current</string> </value> <item>
</item> <key> <string>time</string> </key>
<item> <value>
<key> <string>time</string> </key> <object>
<value> <klass>
<object> <global name="DateTime" module="DateTime.DateTime"/>
<klass> </klass>
<global name="DateTime" module="DateTime.DateTime"/> <tuple>
</klass> <none/>
<tuple> </tuple>
<none/> <state>
</tuple> <tuple>
<state> <float>1556782424.57</float>
<tuple> <string>UTC</string>
<float>1576591900.86</float> </tuple>
<string>UTC</string> </state>
</tuple> </object>
</state> </value>
</object> </item>
</value> </dictionary>
</item> </list>
</dictionary> </tuple>
</list>
</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.Workflow"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <tuple>
<item> <none/>
<key> <string>_log</string> </key> <list>
<value> <dictionary>
<list> <item>
<dictionary> <key> <string>action</string> </key>
<item> <value> <string>detect_converted_file</string> </value>
<key> <string>action</string> </key> </item>
<value> <string>detect_converted_file</string> </value> <item>
</item> <key> <string>actor</string> </key>
<item> <value> <string>romain</string> </value>
<key> <string>actor</string> </key> </item>
<value> <string>romain</string> </value> <item>
</item> <key> <string>comment</string> </key>
<item> <value> <string></string> </value>
<key> <string>comment</string> </key> </item>
<value> <string></string> </value> <item>
</item> <key> <string>error_message</string> </key>
<item> <value> <string></string> </value>
<key> <string>error_message</string> </key> </item>
<value> <string></string> </value> <item>
</item> <key> <string>external_processing_state</string> </key>
<item> <value> <string>converted</string> </value>
<key> <string>external_processing_state</string> </key> </item>
<value> <string>converted</string> </value> <item>
</item> <key> <string>serial</string> </key>
<item> <value> <string>0.0.0.0</string> </value>
<key> <string>serial</string> </key> </item>
<value> <string>0.0.0.0</string> </value> <item>
</item> <key> <string>time</string> </key>
<item> <value>
<key> <string>time</string> </key> <object>
<value> <klass>
<object> <global name="DateTime" module="DateTime.DateTime"/>
<klass> </klass>
<global name="DateTime" module="DateTime.DateTime"/> <tuple>
</klass> <none/>
<tuple> </tuple>
<none/> <state>
</tuple> <tuple>
<state> <float>1411723463.29</float>
<tuple> <string>GMT</string>
<float>1411723463.29</float> </tuple>
<string>GMT</string> </state>
</tuple> </object>
</state> </value>
</object> </item>
</value> </dictionary>
</item> </list>
</dictionary> </tuple>
</list>
</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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7