Browse Source

Grant Manage on imported collections to every Custom member

pull/7951/head
tom27052006 3 days ago
parent
commit
3f8979b49b
  1. 4
      src/api/core/organizations.rs

4
src/api/core/organizations.rs

@ -1959,8 +1959,7 @@ async fn post_org_import(
collections: imported_collections, collections: imported_collections,
.. ..
} = data; } = data;
let grant_new_collection_manage = let grant_new_collection_manage = headers.membership.has_type(MembershipType::Custom);
headers.membership.has_type(MembershipType::Custom) && !headers.membership.can_edit_any_collection();
let importer_uuid = headers.membership.user_uuid.clone(); let importer_uuid = headers.membership.user_uuid.clone();
let OrgMemberHeaders { let OrgMemberHeaders {
host, host,
@ -2050,6 +2049,7 @@ mod org_import_tests {
("rollback", MembershipType::Custom, CustomPermission::CreateNewCollections), ("rollback", MembershipType::Custom, CustomPermission::CreateNewCollections),
("index", MembershipType::Custom, CustomPermission::CreateNewCollections), ("index", MembershipType::Custom, CustomPermission::CreateNewCollections),
("disabled", MembershipType::Custom, CustomPermission::CreateNewCollections), ("disabled", MembershipType::Custom, CustomPermission::CreateNewCollections),
("export", MembershipType::Owner, CustomPermission::CreateNewCollections),
] { ] {
test_flag::CUSTOM_ROLES_ENABLED.set(Some(case != "disabled")); test_flag::CUSTOM_ROLES_ENABLED.set(Some(case != "disabled"));
let org = test_db::organization(&conn).await; let org = test_db::organization(&conn).await;

Loading…
Cancel
Save