Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Nicolas Wavrant
erp5
Commits
cec6bdbe
Commit
cec6bdbe
authored
May 02, 2019
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Stay in editable mode after cloning
parent
e1a8baf2
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
135 additions
and
7 deletions
+135
-7
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_action_js.js
...ateItem/web_page_module/rjs_gadget_erp5_page_action_js.js
+6
-3
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_action_js.xml
...teItem/web_page_module/rjs_gadget_erp5_page_action_js.xml
+2
-2
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionLinkClone.xml
..._tests/renderjs_ui_page_zuite/testPageActionLinkClone.xml
+58
-0
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionLinkClone.zpt
..._tests/renderjs_ui_page_zuite/testPageActionLinkClone.zpt
+65
-0
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionLinkList.zpt
...l_tests/renderjs_ui_page_zuite/testPageActionLinkList.zpt
+1
-0
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandDisplayWithHistory.zpt
...enderjs_ui_router_zuite/testCommandDisplayWithHistory.zpt
+3
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_action_js.js
View file @
cec6bdbe
...
@@ -18,7 +18,8 @@
...
@@ -18,7 +18,8 @@
* @param {string} icon - alias used in font-awesome iconset
* @param {string} icon - alias used in font-awesome iconset
* @param {Array} command_list - array of links obtained from ERP5 HATEOAS
* @param {Array} command_list - array of links obtained from ERP5 HATEOAS
*/
*/
function
renderLinkList
(
gadget
,
jio_key
,
title
,
icon
,
erp5_link_list
)
{
function
renderLinkList
(
gadget
,
jio_key
,
title
,
icon
,
erp5_link_list
,
editable
)
{
return
new
RSVP
.
Queue
()
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
.
push
(
function
()
{
return
RSVP
.
all
(
return
RSVP
.
all
(
...
@@ -27,7 +28,8 @@
...
@@ -27,7 +28,8 @@
"
command
"
:
'
display_with_history_and_cancel
'
,
"
command
"
:
'
display_with_history_and_cancel
'
,
"
options
"
:
{
"
options
"
:
{
"
jio_key
"
:
jio_key
,
"
jio_key
"
:
jio_key
,
"
view
"
:
erp5_link
.
href
"
view
"
:
erp5_link
.
href
,
"
editable
"
:
editable
}
}
});
});
})
})
...
@@ -86,7 +88,8 @@
...
@@ -86,7 +88,8 @@
return
RSVP
.
all
([
return
RSVP
.
all
([
renderLinkList
(
gadget
,
options
.
jio_key
,
"
Workflows
"
,
"
random
"
,
transition_list
),
renderLinkList
(
gadget
,
options
.
jio_key
,
"
Workflows
"
,
"
random
"
,
transition_list
),
renderLinkList
(
gadget
,
options
.
jio_key
,
"
Actions
"
,
"
gear
"
,
action_list
),
renderLinkList
(
gadget
,
options
.
jio_key
,
"
Actions
"
,
"
gear
"
,
action_list
),
renderLinkList
(
gadget
,
options
.
jio_key
,
"
Clone
"
,
"
clone
"
,
clone_list
),
// Stay in editable mode after cloning, as user will probably edit the new document
renderLinkList
(
gadget
,
options
.
jio_key
,
"
Clone
"
,
"
clone
"
,
clone_list
,
true
),
renderLinkList
(
gadget
,
options
.
jio_key
,
"
Delete
"
,
"
trash-o
"
,
delete_list
)
renderLinkList
(
gadget
,
options
.
jio_key
,
"
Delete
"
,
"
trash-o
"
,
delete_list
)
]);
]);
})
})
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_action_js.xml
View file @
cec6bdbe
...
@@ -228,7 +228,7 @@
...
@@ -228,7 +228,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
2.58906.44395.12356
</string>
</value>
<value>
<string>
97
5.28835.21901.16230
</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>
15
47211850.35
</float>
<float>
15
56786223.13
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionLinkClone.xml
0 → 100644
View file @
cec6bdbe
<?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>
testPageActionLinkClone
</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_zuite/testPageActionLinkClone.zpt
0 → 100644
View file @
cec6bdbe
<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 Page Front
</title>
</head>
<body>
<table
cellpadding=
"1"
cellspacing=
"1"
border=
"1"
>
<thead>
<tr><td
rowspan=
"1"
colspan=
"3"
>
Test Page Tab Link List
</td></tr>
</thead><tbody>
<tal:block
metal:use-macro=
"here/PTZuite_CommonTemplate/macros/init"
/>
<tr>
<td>
open
</td>
<td>
${base_url}/web_site_module/renderjs_runner/#/foo_module/1?page=action
</td>
<td></td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded"
/>
<tr>
<td>
assertElementPresent
</td>
<td>
//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_page_action.html']
</td>
<td></td>
</tr>
<tr>
<td>
assertTextPresent
</td>
<td>
Title 1
</td>
<td></td>
</tr>
<!-- Generate links to parents -->
<tr>
<td>
assertTextPresent
</td>
<td>
Actions
</td>
<td></td>
</tr>
<tr>
<td>
assertElementPresent
</td>
<td>
//div[@data-gadget-scope='m']//a[text()='Clone Document' and contains(@href, '#!display_with_history_and_cancel') and contains(@href, 'clone_document')]
</td>
<td></td>
</tr>
<!-- Follow one link -->
<tal:block
tal:define=
"click_configuration python: {'text': 'Clone Document'}"
>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_page_link"
/>
</tal:block>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded"
/>
<tr>
<td>
assertElementPresent
</td>
<td>
//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_dialog.html']
</td>
<td></td>
</tr>
<tr>
<td>
assertTextPresent
</td>
<td>
Clone Document
</td>
<td></td>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/verify_is_editable_mode"
/>
</tbody></table>
</body>
</html>
\ No newline at end of file
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageActionLinkList.zpt
View file @
cec6bdbe
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
<td>
Please do nothing Dialog
</td>
<td>
Please do nothing Dialog
</td>
<td></td>
<td></td>
</tr>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/verify_is_non_editable_mode"
/>
</tbody></table>
</tbody></table>
</body>
</body>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandDisplayWithHistory.zpt
View file @
cec6bdbe
...
@@ -72,14 +72,15 @@
...
@@ -72,14 +72,15 @@
'text': 'Created Clone Foo.'}"
>
'text': 'Created Clone Foo.'}"
>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification"
/>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification"
/>
</tal:block>
</tal:block>
<tal:block
metal:use-macro=
"here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded"
/>
<tr>
<tr>
<td
colspan=
"3"
><b>
Ensure backlink redirect to module
</b></td>
<td
colspan=
"3"
><b>
Ensure backlink redirect to module
</b></td>
</tr>
</tr>
<tr>
<tr>
<td>
waitForTextPresent
</td>
<td>
assertValue
</td>
<td>
//input[@name="field_my_id"]
</td>
<td>
2
</td>
<td>
2
</td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>
assertElementPresent
</td>
<td>
assertElementPresent
</td>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment