Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
b1d8a08a
Commit
b1d8a08a
authored
Oct 26, 2020
by
Ryan Herbert
Committed by
Mikaël Salson
Nov 20, 2020
Browse files
force inner joins on sample_set query
parent
5d681766
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/web2py/applications/vidjil/models/sample_set_list.py
View file @
b1d8a08a
...
...
@@ -44,9 +44,11 @@ class SampleSetList():
groupby
=
[
s_table
.
id
,
s_table
.
sample_set_id
,
s_table
.
info
,
db
.
auth_user
.
last_name
]
groupby
+=
helper
.
get_dedicated_group
()
query
=
((
auth
.
vidjil_accessible_query
(
'read'
,
db
.
sample_set
))
&
(
s_table
.
sample_set_id
==
db
.
sample_set
.
id
)
&
(
s_table
.
creator
==
db
.
auth_user
.
id
))
join
=
[
s_table
.
on
(
s_table
.
sample_set_id
==
db
.
sample_set
.
id
),
db
.
auth_user
.
on
(
db
.
auth_user
.
id
==
s_table
.
creator
)
]
query
=
(
auth
.
vidjil_accessible_query
(
'read'
,
db
.
sample_set
))
if
search
is
not
None
and
search
!=
""
:
query
=
(
query
&
...
...
@@ -79,6 +81,7 @@ class SampleSetList():
db
.
tag_ref
.
table_name
,
count
,
*
select
+
dedicated_fields
,
join
=
join
,
left
=
left
,
limitby
=
limitby
,
orderby
=
~
db
[
self
.
type
].
id
,
...
...
@@ -91,6 +94,7 @@ class SampleSetList():
query
).
select
(
*
select
+
dedicated_fields
,
join
=
join
,
left
=
left
,
limitby
=
limitby
,
groupby
=
groupby
,
...
...
Write
Preview
Supports
Markdown
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