Skip to content

erp5
erp5
Commit fb27d5de authored by Tristan Cavelier's avatar Tristan Cavelier
Browse files
Options

[erp5_web_renderjs_ui] Display module actions in panel 

- Hardcodes a panel "VIEWS: List" to hide "consistency", "history" and "metadata".
- Only show "WORKFLOWS" on module document.

For instance, on Foo Module the menu panel shows now :

    VIEWS
      List
    ACTIONS
      Do Something

/reviewed-on nexedi/erp5!673
parent cfca73bf
Hide whitespace changes
Inline Side-by-side
Showing with 364 additions and 20 deletions
bt5/erp5_ui_test/ActionTemplateItem/portal_types/Foo%20Module/do_nothing_action_jio.xml 0 → 100644
View file @ fb27d5de
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>action</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>action_type/object_jio_action</string>
</tuple>
</value>
</item>
<item>
<key> <string>category</string> </key>
<value> <string>object_jio_action</string> </value>
</item>
<item>
<key> <string>condition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>icon</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>do_nothing_action_jio</string> </value>
</item>
<item>
<key> <string>permissions</string> </key>
<value>
<tuple>
<string>View</string>
</tuple>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Action Information</string> </value>
</item>
<item>
<key> <string>priority</string> </key>
<value> <float>1.0</float> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Do Nothing Action</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Expression" module="Products.CMFCore.Expression"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>text</string> </key>
<value> <string>string:${object_url}/Foo_viewDoNothingActionDialog</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_ui_test/bt/template_action_path_list
View file @ fb27d5de
...@@ -9,6 +9,7 @@ Foo Line | view ...@@ -9,6 +9,7 @@ Foo Line | view
Foo Line | view_contentlist Foo Line | view_contentlist
Foo Line | view_dynamic_matrixbox Foo Line | view_dynamic_matrixbox
Foo Line | view_matrixbox Foo Line | view_matrixbox
Foo Module | do_nothing_action_jio
Foo Module | do_nothing_report_jio Foo Module | do_nothing_report_jio
Foo Module | empty_mass_action Foo Module | empty_mass_action
Foo Module | list Foo Module | list
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_html.html
View file @ fb27d5de
...@@ -6,6 +6,7 @@ data-i18n=You do not have the permissions to edit the object. ...@@ -6,6 +6,7 @@ data-i18n=You do not have the permissions to edit the object.
data-i18n=You are offline. data-i18n=You are offline.
data-i18n=Action succeeded. data-i18n=Action succeeded.
data-i18n=Data received. data-i18n=Data received.
data-i18n=List
--> -->
<html> <html>
<head> <head>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_html.xml
View file @ fb27d5de
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>973.40657.63647.56780</string> </value> <value> <string>974.59811.2178.43622</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1554191060.89</float> <float>1556802379.3</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
View file @ fb27d5de
...@@ -49,6 +49,8 @@ and handling data send&receive. ...@@ -49,6 +49,8 @@ and handling data send&receive.
'gadget_html5_textarea.html', 'gadget_html5_textarea.html',
'gadget_html5_select.html' 'gadget_html5_select.html'
], ],
erp5_module_regexp = /^[^\/]+_module$/,
erp5_portal_document_regexp = /^portal_.*\/.+$/,
erp5_module_document_regexp = /^[^\/]+_module\/.+$/; erp5_module_document_regexp = /^[^\/]+_module\/.+$/;
/*jslint regexp: false*/ /*jslint regexp: false*/
...@@ -114,6 +116,7 @@ and handling data send&receive. ...@@ -114,6 +116,7 @@ and handling data send&receive.
.declareAcquiredMethod("notifyChange", "notifyChange") .declareAcquiredMethod("notifyChange", "notifyChange")
.declareAcquiredMethod("notifySubmitting", "notifySubmitting") .declareAcquiredMethod("notifySubmitting", "notifySubmitting")
.declareAcquiredMethod("notifySubmitted", "notifySubmitted") .declareAcquiredMethod("notifySubmitted", "notifySubmitted")
.declareAcquiredMethod("getTranslationList", "getTranslationList")
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// Proxy methods to the child gadget // Proxy methods to the child gadget
...@@ -268,6 +271,9 @@ and handling data send&receive. ...@@ -268,6 +271,9 @@ and handling data send&receive.
gadget = this, gadget = this,
options = gadget.state.options, options = gadget.state.options,
page_template_gadget, page_template_gadget,
is_module = erp5_module_regexp.test(gadget.state.options.jio_key),
is_module_document = erp5_module_document_regexp.test(gadget.state.options.jio_key),
is_portal_document = erp5_portal_document_regexp.test(gadget.state.options.jio_key),
erp5_document = JSON.parse(gadget.state.erp5_document), erp5_document = JSON.parse(gadget.state.erp5_document),
erp5_form = JSON.parse(gadget.state.erp5_form); erp5_form = JSON.parse(gadget.state.erp5_form);
...@@ -307,17 +313,29 @@ and handling data send&receive. ...@@ -307,17 +313,29 @@ and handling data send&receive.
} }
}) })
.push(function () { .push(function () {
var jio_key = gadget.state.options.jio_key; if (is_module) {
/*jslint regexp: true*/ return gadget.getTranslationList(["List"]);
if ((erp5_module_document_regexp.test(jio_key)) || (/^portal_.*\/.+$/.test(jio_key))) {
/*jslint regexp: false*/
return gadget.updatePanel({
erp5_document: erp5_document,
editable: gadget.state.options.editable,
jio_key: jio_key,
view: options.view
});
} }
})
.push(function (translation_list) {
var display_workflow_list = true;
if (is_module) {
if (erp5_document._links) {
// hardcode "VIEWS: List" to hide "consistency", "history" and "metadata"
erp5_document._links.action_object_view =
[{"name": "view", "title": translation_list[0], "href": "view", "icon": null}];
display_workflow_list = false;
}
} else if (!(is_module_document || is_portal_document)) {
return;
}
return gadget.updatePanel({
display_workflow_list: display_workflow_list,
erp5_document: erp5_document,
editable: gadget.state.options.editable,
jio_key: gadget.state.options.jio_key,
view: options.view
});
}); });
}) })
/** SubmitContent should be called by the gadget which renders submit button /** SubmitContent should be called by the gadget which renders submit button
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
View file @ fb27d5de
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>972.50141.1687.13277</string> </value> <value> <string>975.56533.48127.29525</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1546616402.84</float> <float>1558448080.86</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.js
View file @ fb27d5de
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
jio_key = options.jio_key, jio_key = options.jio_key,
view = options.view, view = options.view,
visible = options.visible, visible = options.visible,
display_workflow_list,
context = this, context = this,
workflow_list, workflow_list,
view_list, view_list,
...@@ -70,6 +71,13 @@ ...@@ -70,6 +71,13 @@
if (visible === undefined) { if (visible === undefined) {
visible = context.state.visible; visible = context.state.visible;
} }
if (options.display_workflow_list === undefined) {
display_workflow_list = true;
} else {
display_workflow_list = asBoolean(options.display_workflow_list);
}
if ((erp5_document !== undefined) && (jio_key !== undefined)) { if ((erp5_document !== undefined) && (jio_key !== undefined)) {
workflow_list = ensureArray(erp5_document._links.action_workflow); workflow_list = ensureArray(erp5_document._links.action_workflow);
view_list = ensureArray(erp5_document._links.action_object_view); view_list = ensureArray(erp5_document._links.action_object_view);
...@@ -102,6 +110,7 @@ ...@@ -102,6 +110,7 @@
.push(function (editable) { .push(function (editable) {
return context.changeState({ return context.changeState({
visible: visible, visible: visible,
display_workflow_list: display_workflow_list,
workflow_list: workflow_list, workflow_list: workflow_list,
view_list: view_list, view_list: view_list,
action_list: action_list, action_list: action_list,
...@@ -115,6 +124,7 @@ ...@@ -115,6 +124,7 @@
.onStateChange(function onStateChange(modification_dict) { .onStateChange(function onStateChange(modification_dict) {
var context = this, var context = this,
gadget = this, gadget = this,
workflow_list,
queue = new RSVP.Queue(); queue = new RSVP.Queue();
if (modification_dict.hasOwnProperty("visible")) { if (modification_dict.hasOwnProperty("visible")) {
...@@ -233,9 +243,9 @@ ...@@ -233,9 +243,9 @@
.push(function () { .push(function () {
var i = 0, var i = 0,
parameter_list = [], parameter_list = [],
workflow_list = JSON.parse(gadget.state.workflow_list),
view_list = JSON.parse(gadget.state.view_list), view_list = JSON.parse(gadget.state.view_list),
action_list = JSON.parse(gadget.state.action_list); action_list = JSON.parse(gadget.state.action_list);
workflow_list = JSON.parse(gadget.state.workflow_list);
for (i = 0; i < view_list.length; i += 1) { for (i = 0; i < view_list.length; i += 1) {
parameter_list.push({ parameter_list.push({
...@@ -272,14 +282,16 @@ ...@@ -272,14 +282,16 @@
.push(function (result_list) { .push(function (result_list) {
var dl_element, var dl_element,
dl_fragment = document.createDocumentFragment(), dl_fragment = document.createDocumentFragment(),
workflow_list = JSON.parse(gadget.state.workflow_list),
view_list = JSON.parse(gadget.state.view_list), view_list = JSON.parse(gadget.state.view_list),
action_list = JSON.parse(gadget.state.action_list); action_list = JSON.parse(gadget.state.action_list);
appendDt(dl_fragment, result_list[1][0], 'eye', appendDt(dl_fragment, result_list[1][0], 'eye',
view_list, result_list[0], 0); view_list, result_list[0], 0);
appendDt(dl_fragment, result_list[1][1], 'random', if (gadget.state.display_workflow_list) {
workflow_list, result_list[0], view_list.length); // show Workflows only on document
appendDt(dl_fragment, result_list[1][1], 'random',
workflow_list, result_list[0], view_list.length);
}
appendDt(dl_fragment, result_list[1][2], 'cogs', appendDt(dl_fragment, result_list[1][2], 'cogs',
action_list, result_list[0], action_list, result_list[0],
view_list.length + workflow_list.length); view_list.length + workflow_list.length);
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_panel_js.xml
View file @ fb27d5de
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>972.50145.12391.26965</string> </value> <value> <string>975.56491.25907.38877</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1546958744.66</float> <float>1558448423.72</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuActionLink.xml 0 → 100644
View file @ fb27d5de
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>testFormListMenuActionLink</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuActionLink.zpt 0 → 100644
View file @ fb27d5de
<html xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Test Form View Editable Save Action</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">Test Default Module View</td></tr>
</thead><tbody>
<tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />
<tr>
<td>open</td>
<td>&#36;{base_url}/web_site_module/renderjs_runner/#/foo_module</td>
<td></td>
</tr>
<!-- Wait for gadget to be loaded -->
<tr>
<td>waitForElementPresent</td>
<td>//div[@data-gadget-url='&#36;{base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']</td>
<td></td>
</tr>
<tr>
<td>waitForTextPresent</td>
<td>Add</td>
<td></td>
</tr>
<!-- Go to the action from the panel -->
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/open_menu_panel" />
<tr>
<td>assertElementPresent</td>
<td>//div[@data-gadget-scope='panel' and contains(@class, 'visible')]//a[text()='Do Nothing Action']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@data-gadget-scope='panel']//a[text()='Do Nothing Action']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@data-gadget-url='&#36;{base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_dialog.html']</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
<tal:block tal:define="notification_configuration python: {'class': 'success',
'text': '&quot;Nothing&quot; action is done.'}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
</tal:block>
</tbody></table>
</body>
</html>
\ No newline at end of file
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuViewLink.xml 0 → 100644
View file @ fb27d5de
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>testFormListMenuViewLink</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListMenuViewLink.zpt 0 → 100644
View file @ fb27d5de
<html xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Test Default Module View</title>
</head>
<body>
<table cellpadding="1" cellspacing="1" border="1">
<thead>
<tr><td rowspan="1" colspan="3">Test Default Module View</td></tr>
</thead><tbody>
<tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />
<tr>
<td>open</td>
<td>&#36;{base_url}/web_site_module/renderjs_runner/#/foo_module</td>
<td></td>
</tr>
<!-- Wait for gadget to be loaded -->
<tr>
<td>waitForElementPresent</td>
<td>//div[@data-gadget-url='&#36;{base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']</td>
<td></td>
</tr>
<tr>
<td>waitForTextPresent</td>
<td>Add</td>
<td></td>
</tr>
<!-- Go to the views from the panel -->
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/open_menu_panel" />
<tr>
<td>assertElementPresent</td>
<td>//div[@data-gadget-scope='panel' and contains(@class, 'visible')]//a[text()='List']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@data-gadget-scope='panel']//a[text()='List']</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tr>
<td>waitForElementPresent</td>
<td>//div[@data-gadget-url='&#36;{base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']</td>
<td></td>
</tr>
</tbody></table>
</body>
</html>
\ No newline at end of file
bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Base_createBaseLanguage.py
View file @ fb27d5de
...@@ -75,6 +75,7 @@ param_dict = [ ...@@ -75,6 +75,7 @@ param_dict = [
{ 'message': 'Foo Category', 'translation': 'Foo leibie', 'language': 'wo'}, { 'message': 'Foo Category', 'translation': 'Foo leibie', 'language': 'wo'},
{ 'message': 'Configure', 'translation': 'peizhi', 'language': 'wo'}, { 'message': 'Configure', 'translation': 'peizhi', 'language': 'wo'},
{ 'message': 'Configure Editor', 'translation': 'peizhibianjiqi', 'language': 'wo'}, { 'message': 'Configure Editor', 'translation': 'peizhibianjiqi', 'language': 'wo'},
{ 'message': 'List', 'translation': 'liebiao', 'language': 'wo'},
{ 'message': 'This page contains unsaved changes, do you really want to leave the page ?', 'translation': 'querenlikai?', 'language': 'wo'} { 'message': 'This page contains unsaved changes, do you really want to leave the page ?', 'translation': 'querenlikai?', 'language': 'wo'}
] ]
for tmp in param_dict: for tmp in param_dict:
......
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