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
Laurent S
erp5
Commits
81cda1b1
Commit
81cda1b1
authored
May 19, 2017
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Form.ListBox: Extend select_expression cleanup to modern equivalents
parent
699759bc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
product/ERP5Form/ListBox.py
product/ERP5Form/ListBox.py
+4
-3
No files found.
product/ERP5Form/ListBox.py
View file @
81cda1b1
...
@@ -1224,7 +1224,7 @@ class ListBoxRenderer:
...
@@ -1224,7 +1224,7 @@ class ListBoxRenderer:
params
[
'select_columns'
]
=
', '
.
join
(
sql_column_list
)
params
[
'select_columns'
]
=
', '
.
join
(
sql_column_list
)
# XXX Remove selection_expression if present.
# XXX Remove selection_expression
(and equivalents)
if present.
# This is necessary for now, because the actual selection expression in
# This is necessary for now, because the actual selection expression in
# search catalog does not take the requested columns into account. If
# search catalog does not take the requested columns into account. If
# select_expression is passed, this can raise an exception, because stat
# select_expression is passed, this can raise an exception, because stat
...
@@ -1236,8 +1236,9 @@ class ListBoxRenderer:
...
@@ -1236,8 +1236,9 @@ class ListBoxRenderer:
# catalog.* but only selection_expression. But this is a bit difficult,
# catalog.* but only selection_expression. But this is a bit difficult,
# because there is no simple way to distinguish queried columns from callable
# because there is no simple way to distinguish queried columns from callable
# objects in the current ListBox configuration.
# objects in the current ListBox configuration.
if
'select_expression'
in
params
:
params
.
pop
(
'select_expression'
,
None
)
del
params
[
'select_expression'
]
params
.
pop
(
'select_list'
,
None
)
params
.
pop
(
'select_dict'
,
None
)
params
.
setdefault
(
'limit'
,
1000
)
params
.
setdefault
(
'limit'
,
1000
)
self
.
getSelection
().
edit
(
params
=
params
)
self
.
getSelection
().
edit
(
params
=
params
)
...
...
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