[PR 6] Add organization data access permissions for Custom Roles (#7964)

* Add Custom Roles organization data access

* Let direct collection assignments override groups on import
This commit is contained in:
Tom authored and GitHub committed 2026-11-15 11:41:04 +01:00
1 parent bd7beab76e
commit b0048fa27f
7 files changed
+209 -61

No files matched your search

+2
View File
@@ -331,6 +331,7 @@ impl Event {
pub async fn find_by_cipher_uuid(
cipher_uuid: &CipherId,
org_uuid: &OrganizationId,
start: &NaiveDateTime,
end: &NaiveDateTime,
conn: &DbConn,
@@ -338,6 +339,7 @@ impl Event {
conn.run(move |conn| {
event::table
.filter(event::cipher_uuid.eq(cipher_uuid))
.filter(event::org_uuid.eq(org_uuid))
.filter(event::event_date.between(start, end))
.order_by(event::event_date.desc())
.limit(Self::PAGE_SIZE)