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
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
ca6659ac
Commit
ca6659ac
authored
Feb 21, 2024
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: display workflows sorted in History tab
parent
56754c79
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
53 additions
and
49 deletions
+53
-49
bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.erp5.testHalJsonStyle.py
...plateItem/portal_components/test.erp5.testHalJsonStyle.py
+40
-34
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistoricalDiff.zpt
...teItem/portal_tests/document_zuite/testHistoricalDiff.zpt
+4
-4
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistoricalDiffNoLinkForCurrentChange.zpt
...cument_zuite/testHistoricalDiffNoLinkForCurrentChange.zpt
+4
-6
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.zpt
...hTemplateItem/portal_tests/document_zuite/testHistory.zpt
+4
-4
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistorySectionList.py
...tal_skins/erp5_core/Base_getWorkflowHistorySectionList.py
+1
-1
No files found.
bt5/erp5_hal_json_style/TestTemplateItem/portal_components/test.erp5.testHalJsonStyle.py
View file @
ca6659ac
...
...
@@ -1186,46 +1186,52 @@ class TestERP5Document_getHateoas_mode_traverse(ERP5HALJSONStyleSkinsMixin):
self.assertEqual(result_dict['
_embedded
']['
_view
']['
form_id
']['
required
'], 1)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
form_id
']['
type
'], '
StringField
')
# this report has 3 report sections, sorted by workflow title
self.assertEqual([
section['
listbox
']['
default_params
']['
workflow_id
']
for section in result_dict['
_embedded
']['
_view
']['
report_section_list
']],
['
edit_workflow
', '
foo_validation_workflow
', '
foo_workflow
'])
# Check embedded report section rendering
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
form_id
']['
default
'], '
Base_viewWorkflowHistory
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
form_id
']['
editable
'], 0)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
form_id
']['
hidden
'], 1)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
form_id
']['
key
'], '
form_id
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
form_id
']['
required
'], 1)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
form_id
']['
type
'], '
StringField
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
_links
']['
traversed_document
']['
href
'], '
urn
:
jio
:
get
:
%
s
' % document.getRelativeUrl())
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
_links
']['
traversed_document
']['
name
'], document.getRelativeUrl())
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
_links
']['
traversed_document
']['
title
'], str2unicode(document.getTitle()))
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
_links
']['
form_definition
']['
href
'], '
urn
:
jio
:
get
:
portal_skins
/
erp5_core
/
Base_viewWorkflowHistory
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
_links
']['
form_definition
']['
name
'], '
Base_viewWorkflowHistory
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
form_id
']['
default
'], '
Base_viewWorkflowHistory
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
form_id
']['
editable
'], 0)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
form_id
']['
hidden
'], 1)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
form_id
']['
key
'], '
form_id
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
form_id
']['
required
'], 1)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
form_id
']['
type
'], '
StringField
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
_links
']['
traversed_document
']['
href
'], '
urn
:
jio
:
get
:
%
s
' % document.getRelativeUrl())
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
_links
']['
traversed_document
']['
name
'], document.getRelativeUrl())
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
_links
']['
traversed_document
']['
title
'], str2unicode(document.getTitle()))
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
_links
']['
form_definition
']['
href
'], '
urn
:
jio
:
get
:
portal_skins
/
erp5_core
/
Base_viewWorkflowHistory
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
_links
']['
form_definition
']['
name
'], '
Base_viewWorkflowHistory
')
self.assertEqual(
result_dict['
_embedded
']['
_view
']['
_embedded
']['
form_definition
']['
pt
'],
'
report_view
'
)
self.assertSameSet(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
default_params
'].keys(), ['
checked_permission
', '
ignore_unknown_columns
', '
workflow_id
', '
workflow_title
'])
self.assertTrue(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
default_params
']['
ignore_unknown_columns
'])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
default_params
']['
checked_permission
'], '
View
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
default_params
']['
workflow_id
'], '
foo_workflow
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
default_params
']['
workflow_title
'], '
Foo
Workflow
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
type
'], '
ListBox
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1]['
listbox
']['
key
'], '
x1
_listbox
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
title
'], '
Workflow
History
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
selection_name
'], '
base_workflow_history_selection
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
checked_uid_list
'], [])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
lines
'], 15)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
editable
'], 1)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
show_anchor
'], 0)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
list_method
'], '
Base_getWorkflowHistoryItemList
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
query
'], '
urn
:
jio
:
allDocs
?
query
=
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
portal_type
'], [])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
column_list
'], [['
action
', '
Action
'], ['
state
', '
State
'], ['
actor
', '
Actor
'], ['
time
', '
Time
'], ['
comment
', '
Comment
'], ['
error_message
', '
Error
Message
']])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
search_column_list
'], [])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
editable_column_list
'], [['
time
', '
Time
'], ['
comment
', '
Comment
'], ['
error_message
', '
Error
Message
']])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
sort_column_list
'], [])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
1
]['
listbox
']['
list_method_template
'],
self.assertSameSet(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
default_params
'].keys(), ['
checked_permission
', '
ignore_unknown_columns
', '
workflow_id
', '
workflow_title
'])
self.assertTrue(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
default_params
']['
ignore_unknown_columns
'])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
default_params
']['
checked_permission
'], '
View
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
default_params
']['
workflow_id
'], '
foo_workflow
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
default_params
']['
workflow_title
'], '
Foo
Workflow
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
type
'], '
ListBox
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2]['
listbox
']['
key
'], '
x2
_listbox
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
title
'], '
Workflow
History
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
selection_name
'], '
base_workflow_history_selection
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
checked_uid_list
'], [])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
lines
'], 15)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
editable
'], 1)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
show_anchor
'], 0)
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
list_method
'], '
Base_getWorkflowHistoryItemList
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
query
'], '
urn
:
jio
:
allDocs
?
query
=
')
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
portal_type
'], [])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
column_list
'], [['
action
', '
Action
'], ['
state
', '
State
'], ['
actor
', '
Actor
'], ['
time
', '
Time
'], ['
comment
', '
Comment
'], ['
error_message
', '
Error
Message
']])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
search_column_list
'], [])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
editable_column_list
'], [['
time
', '
Time
'], ['
comment
', '
Comment
'], ['
error_message
', '
Error
Message
']])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
sort_column_list
'], [])
self.assertEqual(result_dict['
_embedded
']['
_view
']['
report_section_list
'][
2
]['
listbox
']['
list_method_template
'],
'
%
s
/
web_site_module
/
hateoas
/
ERP5Document_getHateoas
?
mode
=
search
&
relative_url
=
foo_module
%%
2
F
%
s
&
form_relative_url
=
portal_skins
/
erp5_core
/
Base_viewWorkflowHistory
/
listbox
&
list_method
=
Base_getWorkflowHistoryItemList
&
extra_param_json
=
eyJmb3JtX2lkIjogIkJhc2Vfdmlld1dvcmtmbG93SGlzdG9yeSJ9
&
default_param_json
=
eyJ3b3JrZmxvd19pZCI6ICJmb29fd29ya2Zsb3ciLCAiY2hlY2tlZF9wZXJtaXNzaW9uIjogIlZpZXciLCAid29ya2Zsb3dfdGl0bGUiOiAiRm9vIFdvcmtmbG93IiwgImlnbm9yZV91bmtub3duX2NvbHVtbnMiOiB0cnVlfQ
==
{
&
query
,
select_list
*
,
limit
*
,
group_by
*
,
sort_on
*
,
local_roles
*
,
selection_domain
*
}
' % (self.portal.absolute_url(), document.getId()))
...
...
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistoricalDiff.zpt
View file @
ca6659ac
...
...
@@ -81,13 +81,13 @@
</tr>
<tr>
<td>
verifyText
</td>
<td>
//
span[@class="listbox-current-page-total-number x0_listbox-current-page-total-number"
]
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../..//span[contains(@class, "current-page-total-number")
]
</td>
<td>
4 records
</td>
<!-- Creation + edited 3 times -->
</tr>
<!-- First modification -->
<tr>
<td>
clickAndWait
</td>
<td>
//
tr[@class='x0_listbox-data-line-1 DataB'
]/td[4]/a
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../../../../..//table//tr[2
]/td[4]/a
</td>
<td></td>
</tr>
<tr>
...
...
@@ -153,13 +153,13 @@
</tr>
<tr>
<td>
verifyText
</td>
<td>
//
span[@class="listbox-current-page-total-number x0_listbox-current-page-total-number"
]
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../..//span[contains(@class, "current-page-total-number")
]
</td>
<td>
4 records
</td>
<!-- Creation + edited 3 times -->
</tr>
<!-- First modification -->
<tr>
<td>
clickAndWait
</td>
<td>
//
tr[@class='x0_listbox-data-line-1 DataB'
]/td[4]/a
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../../../../..//table//tr[2
]/td[4]/a
</td>
<td></td>
</tr>
<tr>
...
...
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistoricalDiffNoLinkForCurrentChange.zpt
View file @
ca6659ac
...
...
@@ -81,13 +81,12 @@
</tr>
<tr>
<td>
verifyText
</td>
<td>
//
span[@class="listbox-current-page-total-number x0_listbox-current-page-total-number"
]
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../..//span[contains(@class, "current-page-total-number")
]
</td>
<td>
4 records
</td>
<!-- Creation + edited 3 times -->
</tr>
<!-- First modification -->
<tr>
<td>
clickAndWait
</td>
<td>
//
tr[@class='x0_listbox-data-line-3 DataB'
]/td[4]/a
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../../../../..//table//tr[4
]/td[4]/a
</td>
<td></td>
</tr>
<tr>
...
...
@@ -153,13 +152,12 @@
</tr>
<tr>
<td>
verifyText
</td>
<td>
//
span[@class="listbox-current-page-total-number x0_listbox-current-page-total-number"
]
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../..//span[contains(@class, "current-page-total-number")
]
</td>
<td>
4 records
</td>
<!-- Creation + edited 3 times -->
</tr>
<!-- First modification -->
<tr>
<td>
clickAndWait
</td>
<td>
//
tr[@class='x0_listbox-data-line-3 DataB'
]/td[4]/a
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../../../../..//table//tr[4
]/td[4]/a
</td>
<td></td>
</tr>
<tr>
...
...
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.zpt
View file @
ca6659ac
...
...
@@ -84,7 +84,7 @@
</tr>
<tr>
<td>
verifyText
</td>
<td>
//
span[@class="listbox-current-page-total-number x0_listbox-current-page-total-number"
]
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../..//span[contains(@class, "current-page-total-number")
]
</td>
<td>
4 records
</td>
<!-- Creation + edited 3 times -->
</tr>
...
...
@@ -92,7 +92,7 @@
<tal:block
tal:condition=
"python: context.TestTool_getSkinName()!='Mobile'"
>
<tr>
<td>
clickAndWait
</td>
<td>
//
tr[@class='x0_listbox-data-line-1 DataB'
]/td[4]/a
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../../../../..//table//tr[2
]/td[4]/a
</td>
<td></td>
</tr>
<tr>
...
...
@@ -157,7 +157,7 @@
<tal:block
tal:condition=
"python: context.TestTool_getSkinName()!='Mobile'"
>
<tr>
<td>
clickAndWait
</td>
<td>
//
tr[@class='x0_listbox-data-line-2 DataA'
]/td[4]/a
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../../../../..//table//tr[3
]/td[4]/a
</td>
<td></td>
</tr>
</tal:block>
...
...
@@ -235,7 +235,7 @@
<tal:block
tal:condition=
"python: context.TestTool_getSkinName()!='Mobile'"
>
<tr>
<td>
clickAndWait
</td>
<td>
//
tr[@class='x0_listbox-data-line-3 DataB'
]/td[4]/a
</td>
<td>
//
div[@class="listbox-title"]//span[text()="Edit Workflow"]/../../../../../..//table//tr[4
]/td[4]/a
</td>
<td></td>
</tr>
</tal:block>
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getWorkflowHistorySectionList.py
View file @
ca6659ac
...
...
@@ -11,5 +11,5 @@ return [
"workflow_id"
:
workflow_id
,
"workflow_title"
:
portal_workflow
[
workflow_id
].
title
or
workflow_id
},
temporary_selection
=
False
)
for
workflow_id
in
context
.
Base_getWorkflowHistory
(
)
for
workflow_id
in
sorted
(
context
.
Base_getWorkflowHistory
()
)
]
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