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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Georgios Dagkakis
erp5
Commits
d0ce0b9c
Commit
d0ce0b9c
authored
May 19, 2021
by
Gabriel Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_hal_json_style: consider count(*) in regex
parent
adfe6e53
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
...rtal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
+2
-2
No files found.
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.py
View file @
d0ce0b9c
...
@@ -1864,8 +1864,8 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
...
@@ -1864,8 +1864,8 @@ def calculateHateoas(is_portal=None, is_site_root=None, traversed_document=None,
else
:
else
:
catalog_kw
[
'group_by_list'
]
=
[
str
(
group_by
)]
catalog_kw
[
'group_by_list'
]
=
[
str
(
group_by
)]
# Include select, as user may want to count
# Include select, as user may want to count
# For now, consider only functions, for example, count(column_name) or COUNT(column name)
# For now, consider only functions, for example, count(column_name) or COUNT(column name)
or count(*)
catalog_kw
[
"select_list"
]
=
[
x
for
x
in
select_list
if
re
.
match
(
r"^\
D+
\(
\
w+
\)$"
,
x
)]
catalog_kw
[
"select_list"
]
=
[
x
for
x
in
select_list
if
re
.
match
(
r"^\
D+
\(
.*
\
)$
", x)]
if limit:
if limit:
catalog_kw["
limit
"] = limit
catalog_kw["
limit
"] = limit
...
...
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