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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Paul Graydon
erp5
Commits
953b0a0e
Commit
953b0a0e
authored
May 18, 2018
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "[erp5_core] Reinforce comment FormBox re-validation"
This reverts commit
02e06ea3
.
parent
3ba6140d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
16 deletions
+8
-16
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyDocumentListStatus.py
...portal_skins/erp5_core/Folder_modifyDocumentListStatus.py
+1
-9
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyDocumentListStatusDialog.xml
...skins/erp5_core/Folder_modifyDocumentListStatusDialog.xml
+1
-1
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyDocumentListStatusDialog/workflow_dialog_my_workflow_action.xml
...ntListStatusDialog/workflow_dialog_my_workflow_action.xml
+3
-3
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyDocumentListStatusDialog/workflow_dialog_your_workflow_action.xml
...ListStatusDialog/workflow_dialog_your_workflow_action.xml
+3
-3
No files found.
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyDocumentListStatus.py
View file @
953b0a0e
...
@@ -8,7 +8,6 @@ This script is intended as a dialog target.
...
@@ -8,7 +8,6 @@ This script is intended as a dialog target.
:param comment: {str} optional comment
:param comment: {str} optional comment
"""
"""
from
Products.CMFCore.WorkflowCore
import
WorkflowException
from
Products.CMFCore.WorkflowCore
import
WorkflowException
from
Products.Formulator.Errors
import
FormValidationError
,
ValidationError
def
stripMyYour
(
key
):
def
stripMyYour
(
key
):
if
key
.
startswith
(
"your_"
)
or
key
.
startswith
(
"my_"
):
if
key
.
startswith
(
"your_"
)
or
key
.
startswith
(
"my_"
):
...
@@ -74,17 +73,10 @@ tag = 'folder_workflow_action_{:d}'.format(random.randint(0, 1000)) # Kato: how
...
@@ -74,17 +73,10 @@ tag = 'folder_workflow_action_{:d}'.format(random.randint(0, 1000)) # Kato: how
priority
=
3
priority
=
3
batch_size
=
100
batch_size
=
100
workflow_action_kwargs
=
{}
if
workflow_dialog
is
None
:
if
workflow_dialog
is
None
:
workflow_dialog_id
=
context
.
Base_getFormIdForWorkflowAction
(
form_id
,
''
,
workflow_action
,
uids
=
uids
)
workflow_dialog_id
=
context
.
Base_getFormIdForWorkflowAction
(
form_id
,
''
,
workflow_action
,
uids
=
uids
)
workflow_dialog
=
getattr
(
context
,
workflow_dialog_id
)
workflow_dialog
=
getattr
(
context
,
workflow_dialog_id
)
try
:
workflow_action_kwargs
=
workflow_dialog
.
validate_all
(
request
,
key_prefix
=
'field_workflow_dialog'
)
workflow_action_kwargs
=
workflow_dialog
.
validate_all
(
request
,
key_prefix
=
'field_workflow_dialog'
)
except
FormValidationError
,
ValidationError
:
workflow_action_kwargs
[
"comment"
]
=
(
comment
or
kwargs
.
get
(
"field_workflow_dialog_your_comment"
,
""
)
or
kwargs
.
get
(
"field_workflow_dialog_my_comment"
,
""
)
or
kwargs
.
get
(
"field_workflow_dialog_comment"
,
""
))
workflow_action_kwargs
=
{
stripMyYour
(
key
):
value
for
key
,
value
in
workflow_action_kwargs
.
items
()}
workflow_action_kwargs
=
{
stripMyYour
(
key
):
value
for
key
,
value
in
workflow_action_kwargs
.
items
()}
workflow_action_kwargs
[
'workflow_action'
]
=
workflow_action
workflow_action_kwargs
[
'workflow_action'
]
=
workflow_action
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyDocumentListStatusDialog.xml
View file @
953b0a0e
...
@@ -75,10 +75,10 @@
...
@@ -75,10 +75,10 @@
<value>
<value>
<list>
<list>
<string>
workflow_action
</string>
<string>
workflow_action
</string>
<string>
workflow_dialog
</string>
<string>
workflow_dialog_my_workflow_action
</string>
<string>
workflow_dialog_my_workflow_action
</string>
<string>
workflow_dialog_your_workflow_action
</string>
<string>
workflow_dialog_your_workflow_action
</string>
<string>
workflow_action_rendered
</string>
<string>
workflow_action_rendered
</string>
<string>
workflow_dialog
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyDocumentListStatusDialog/workflow_dialog_my_workflow_action.xml
View file @
953b0a0e
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
alternate_name
</string>
</key>
<key>
<string>
alternate_name
</string>
</key>
<value>
<string>
my_workflow_action
</string>
</value>
<value>
<string></string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
css_class
</string>
</key>
<key>
<string>
css_class
</string>
</key>
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
default
</string>
</key>
<key>
<string>
default
</string>
</key>
<value>
<string>
non-existing-dummy
</string>
</value>
<value>
<string></string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
...
@@ -249,7 +249,7 @@
...
@@ -249,7 +249,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
workflow_dialog_my_
workflow_
action
</string>
</value>
<value>
<string>
workflow_dialog_my_action
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
truncate
</string>
</key>
<key>
<string>
truncate
</string>
</key>
...
...
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Folder_modifyDocumentListStatusDialog/workflow_dialog_your_workflow_action.xml
View file @
953b0a0e
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
<dictionary>
<dictionary>
<item>
<item>
<key>
<string>
alternate_name
</string>
</key>
<key>
<string>
alternate_name
</string>
</key>
<value>
<string>
your_workflow_action
</string>
</value>
<value>
<string></string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
css_class
</string>
</key>
<key>
<string>
css_class
</string>
</key>
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
default
</string>
</key>
<key>
<string>
default
</string>
</key>
<value>
<string>
non-existing-dummy
</string>
</value>
<value>
<string></string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
description
</string>
</key>
<key>
<string>
description
</string>
</key>
...
@@ -249,7 +249,7 @@
...
@@ -249,7 +249,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
title
</string>
</key>
<key>
<string>
title
</string>
</key>
<value>
<string>
workflow_dialog_
your
_workflow_action
</string>
</value>
<value>
<string>
workflow_dialog_
my
_workflow_action
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
truncate
</string>
</key>
<key>
<string>
truncate
</string>
</key>
...
...
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