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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
0b0c0089
Commit
0b0c0089
authored
Jun 18, 2019
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_simulation] Prevent duplicated keep_items
parent
e3de4074
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.py
...s/erp5_simulation/Delivery_submitSolveDivergenceDialog.py
+2
-2
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_updateSolveDivergenceDialog.py
...s/erp5_simulation/Delivery_updateSolveDivergenceDialog.py
+2
-2
No files found.
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_submitSolveDivergenceDialog.py
View file @
0b0c0089
...
@@ -16,8 +16,8 @@ if not listbox:
...
@@ -16,8 +16,8 @@ if not listbox:
line_list
=
context
.
Delivery_getSolverDecisionList
(
listbox
=
listbox
)
line_list
=
context
.
Delivery_getSolverDecisionList
(
listbox
=
listbox
)
def
displayParallelChangeMessage
():
def
displayParallelChangeMessage
():
message
=
translateString
(
"Workflow state may have been updated by other user. Please try again."
)
kw
[
"keep_items"
]
=
{
'portal_status_message'
:
translateString
(
"Workflow state may have been updated by other user. Please try again."
)}
return
context
.
Base_redirect
(
form_id
,
keep_items
=
{
'portal_status_message'
:
message
},
**
kw
)
return
context
.
Base_redirect
(
form_id
,
**
kw
)
# if we are not divergence any more
# if we are not divergence any more
if
len
(
line_list
)
==
0
:
if
len
(
line_list
)
==
0
:
...
...
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/Delivery_updateSolveDivergenceDialog.py
View file @
0b0c0089
...
@@ -5,8 +5,8 @@ listbox = request.get('listbox')
...
@@ -5,8 +5,8 @@ listbox = request.get('listbox')
line_list
=
context
.
Delivery_getSolverDecisionList
(
listbox
=
listbox
)
line_list
=
context
.
Delivery_getSolverDecisionList
(
listbox
=
listbox
)
if
len
(
line_list
)
==
0
:
if
len
(
line_list
)
==
0
:
message
=
translateString
(
"Workflow state may have been updated by other user. Please try again."
)
kw
[
"keep_items"
]
=
{
'portal_status_message'
:
translateString
(
"Workflow state may have been updated by other user. Please try again."
)}
return
context
.
Base_redirect
(
form_id
,
keep_items
=
{
'portal_status_message'
:
message
},
**
kw
)
return
context
.
Base_redirect
(
form_id
,
**
kw
)
for
listbox_key
in
listbox
:
for
listbox_key
in
listbox
:
listbox_dict
=
listbox
[
listbox_key
]
listbox_dict
=
listbox
[
listbox_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