From 05bd0fc5ec6d9f1d0db53bd6ddf85eedad26a45c Mon Sep 17 00:00:00 2001 From: Ryan Herbert Date: Fri, 30 Oct 2020 15:47:19 +0000 Subject: [PATCH] my account left join on creator --- .../web2py/applications/vidjil/models/sample_set_list.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/web2py/applications/vidjil/models/sample_set_list.py b/server/web2py/applications/vidjil/models/sample_set_list.py index e7d4bbd50..e2d5f3364 100644 --- a/server/web2py/applications/vidjil/models/sample_set_list.py +++ b/server/web2py/applications/vidjil/models/sample_set_list.py @@ -29,7 +29,9 @@ class SampleSetList(): (db.anon_permission.record_id == s_table.id) & (db.auth_group.id == db.anon_permission.group_id ) & (db.auth_membership.user_id == auth.user_id) & - (db.auth_membership.group_id == db.auth_group.id)) + (db.auth_membership.group_id == db.auth_group.id)), + db.auth_user.on( + db.auth_user.id == s_table.creator) ] # SQL string with GROUP_CONCAT queries @@ -44,9 +46,7 @@ class SampleSetList(): groupby = [s_table.id, s_table.sample_set_id, s_table.info, db.auth_user.last_name] groupby += helper.get_dedicated_group() - join = [s_table.on(s_table.sample_set_id == db.sample_set.id), - db.auth_user.on(db.auth_user.id == s_table.creator) - ] + join = [s_table.on(s_table.sample_set_id == db.sample_set.id)] query = (auth.vidjil_accessible_query('read', db.sample_set)) -- GitLab