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
c173fd6e
Commit
c173fd6e
authored
5 years ago
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_simulation: display merge error if has any
parent
63183b06
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DeliveryModule_mergeDeliveryList.py
...skins/erp5_simulation/DeliveryModule_mergeDeliveryList.py
+5
-2
No files found.
bt5/erp5_simulation/SkinTemplateItem/portal_skins/erp5_simulation/DeliveryModule_mergeDeliveryList.py
View file @
c173fd6e
...
...
@@ -10,7 +10,10 @@ if len(delivery_list) < 2:
qs
=
'?portal_status_message=Please+select+more+than+one+items.'
else
:
ret_url
=
context
.
absolute_url
()
+
'/'
+
form_id
error_list
=
context
.
portal_simulation
.
mergeDeliveryList
(
delivery_list
)
if
not
error_list
:
qs
=
'?portal_status_message=Merged.'
context
.
portal_simulation
.
mergeDeliveryList
(
delivery_list
)
else
:
qs
=
'?portal_status_message=%s'
%
(
' '
.
join
(
error_list
))
return
REQUEST
.
RESPONSE
.
redirect
(
ret_url
+
qs
)
This diff is collapsed.
Click to expand it.
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