Skip to content

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

WIP erp5_web_renderjs_ui: show tools on module list

parent 0ffba5b4
Show whitespace changes
Inline Side-by-side
Showing with 32 additions and 16 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_frontpage_html.html
View file @ 8734fdf7
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<html> <html>
<!-- <!--
data-i18n=Others data-i18n=Others
data-i18n=Tools
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_frontpage_html.xml
View file @ 8734fdf7
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>989.60433.59989.54698</string> </value> <value> <string>986.51245.10858.8089</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1612969553.17</float> <float>1605547612.43</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_frontpage_js.js
View file @ 8734fdf7
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
// Acquired methods // Acquired methods
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
.declareAcquiredMethod("updateHeader", "updateHeader") .declareAcquiredMethod("updateHeader", "updateHeader")
.declareAcquiredMethod("translate", "translate") .declareAcquiredMethod("getTranslationList", "getTranslationList")
.declareAcquiredMethod("getUrlForList", "getUrlForList") .declareAcquiredMethod("getUrlForList", "getUrlForList")
.declareAcquiredMethod("jio_allDocs", "jio_allDocs") .declareAcquiredMethod("jio_allDocs", "jio_allDocs")
...@@ -52,7 +52,8 @@ ...@@ -52,7 +52,8 @@
// First, get the list of modules // First, get the list of modules
return gadget.jio_allDocs({ return gadget.jio_allDocs({
select_list: select_list, select_list: select_list,
query: '(parent_uid:"0" AND meta_type:"ERP5 Folder" AND id:"%_module")', // XXX XXX XXX How to search tools only when developper mode is activated?
query: '(parent_uid:"0" AND (meta_type:"ERP5 Folder" AND id:"%_module") OR (id:"portal_%"))',
limit: 1000 limit: 1000
}) })
.push(function (result_list) { .push(function (result_list) {
...@@ -96,19 +97,21 @@ ...@@ -96,19 +97,21 @@
url_dict_list.push({command: 'display', options: {page: 'language'}}); url_dict_list.push({command: 'display', options: {page: 'language'}});
return RSVP.all([ return RSVP.all([
document_list, document_list,
gadget.translate('Others'), gadget.getTranslationList(['Others', 'Tools']),
gadget.getUrlForList(url_dict_list) gadget.getUrlForList(url_dict_list)
]); ]);
}) })
.push(function (result_list) { .push(function (result_list) {
var document_list = result_list[0], var document_list = result_list[0],
translated_other_title = result_list[1], translated_other_title = result_list[1][0],
translated_tool_title = result_list[1][1],
url_list = result_list[2], url_list = result_list[2],
len = document_list.length, len = document_list.length,
i, i,
card_list = [], card_list = [],
module_list = [], module_list = [],
other_module_list = [], other_module_list = [],
tool_list = [],
current_business_application_title = ''; current_business_application_title = '';
function pushNewCard() { function pushNewCard() {
...@@ -128,6 +131,11 @@ ...@@ -128,6 +131,11 @@
for (i = 0; i < len; i += 1) { for (i = 0; i < len; i += 1) {
// Inject the module url into the document // Inject the module url into the document
document_list[i].link = url_list[i]; document_list[i].link = url_list[i];
// Tools do not have any business application
// Workaround this limitation
if (document_list[i].id.indexOf('portal_') === 0) {
tool_list.push(document_list[i]);
} else {
// Create card if needed // Create card if needed
if (document_list[i].business_application_translated_title !== if (document_list[i].business_application_translated_title !==
current_business_application_title) { current_business_application_title) {
...@@ -138,6 +146,7 @@ ...@@ -138,6 +146,7 @@
} }
module_list.push(document_list[i]); module_list.push(document_list[i]);
} }
}
pushNewCard(); pushNewCard();
if (other_module_list.length) { if (other_module_list.length) {
card_list.push({ card_list.push({
...@@ -145,6 +154,12 @@ ...@@ -145,6 +154,12 @@
module_list: other_module_list module_list: other_module_list
}); });
} }
if (tool_list.length) {
card_list.push({
business_application_translated_title: translated_tool_title,
module_list: tool_list
});
}
generateCardList(gadget.element.querySelector('ul'), card_list); generateCardList(gadget.element.querySelector('ul'), card_list);
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_frontpage_js.xml
View file @ 8734fdf7
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>986.54125.60966.30924</string> </value> <value> <string>988.1080.26744.24678</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1600957441.42</float> <float>1605547733.16</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
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