Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dallin/bus-902-permission-list-bugfixes' into nate/cleanup-permissions-pages

This commit is contained in:
Nate Kelley 2025-01-14 11:12:36 -07:00
parent 97fcc9de04 c8b9a736ee
commit 2d2712e1d8
No known key found for this signature in database
GPG Key ID: FD90372AB8D98B4F
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/routes/rest/routes/datasets/assets/list_dataset_assets.rs
View File

@ -67,7 +67,8 @@ pub async fn list_assets(
.eq(users::id)
.and(dataset_permissions::dataset_id.eq(dataset_id))
.and(dataset_permissions::permission_type.eq("user"))
.and(dataset_permissions::deleted_at.is_null())),
.and(dataset_permissions::deleted_at.is_null())
.and(dataset_permissions::organization_id.eq(organization_id))),
)
.inner_join(
users_to_organizations::table.on(users_to_organizations::user_id.eq(users::id)),
@ -78,7 +79,6 @@ pub async fn list_assets(
"dataset_permissions.id IS NOT NULL",
),
))
.filter(dataset_permissions::organization_id.eq(organization_id))
.filter(users_to_organizations::organization_id.eq(organization_id))
.load::<(User, bool)>(&mut *conn)
.await
@ -107,7 +107,8 @@ pub async fn list_assets(
.eq(permission_groups::id)
.and(dataset_permissions::dataset_id.eq(dataset_id))
.and(dataset_permissions::permission_type.eq("permission_group"))
.and(dataset_permissions::deleted_at.is_null())),
.and(dataset_permissions::deleted_at.is_null())
.and(dataset_permissions::organization_id.eq(organization_id))),
)
.select((
permission_groups::all_columns,
@ -116,7 +117,6 @@ pub async fn list_assets(
),
))
.filter(permission_groups::deleted_at.is_null())
.filter(dataset_permissions::organization_id.eq(organization_id))
.filter(permission_groups::organization_id.eq(organization_id))
.load::<(PermissionGroup, bool)>(&mut *conn)
.await
@ -145,7 +145,8 @@ pub async fn list_assets(
.eq(dataset_groups::id)
.and(dataset_permissions::dataset_id.eq(dataset_id))
.and(dataset_permissions::permission_type.eq("dataset_group"))
.and(dataset_permissions::deleted_at.is_null())),
.and(dataset_permissions::deleted_at.is_null())
.and(dataset_permissions::organization_id.eq(organization_id))),
)
.select((
dataset_groups::all_columns,
@ -154,7 +155,6 @@ pub async fn list_assets(
),
))
.filter(dataset_groups::organization_id.eq(organization_id))
.filter(dataset_permissions::organization_id.eq(organization_id))
.filter(dataset_groups::deleted_at.is_null())
.load::<(DatasetGroup, bool)>(&mut *conn)
.await