From 967b429186290cb3403edb9ac9b00a9e64585252 Mon Sep 17 00:00:00 2001 From: Luisa Date: Wed, 4 Sep 2024 15:59:11 +0200 Subject: [PATCH 1/3] Move moderator_notes to list_of_speakers --- models.yml | 10 +++++----- permission.yml | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/models.yml b/models.yml index 95ef56fa..32bc306b 100644 --- a/models.yml +++ b/models.yml @@ -1898,8 +1898,6 @@ group: - agenda_item.can_manage - agenda_item.can_see - agenda_item.can_see_internal - - agenda_item.can_manage_moderator_notes - - agenda_item.can_see_moderator_notes - assignment.can_manage - assignment.can_nominate_other - assignment.can_nominate_self @@ -1908,6 +1906,8 @@ group: - list_of_speakers.can_be_speaker - list_of_speakers.can_manage - list_of_speakers.can_see + - list_of_speakers.can_manage_moderator_notes + - list_of_speakers.can_see_moderator_notes - mediafile.can_manage - mediafile.can_see - meeting.can_manage_logos_and_fonts @@ -2108,9 +2108,6 @@ agenda_item: description: Given in seconds minimum: 0 restriction_mode: B - moderator_notes: - type: HTMLStrict - restriction_mode: D is_internal: type: boolean description: Calculated by the server @@ -2187,6 +2184,9 @@ list_of_speakers: required: true restriction_mode: A constant: true + moderator_notes: + type: HTMLStrict + restriction_mode: D content_object_id: type: generic-relation diff --git a/permission.yml b/permission.yml index 081e25a6..a1ebfde6 100644 --- a/permission.yml +++ b/permission.yml @@ -10,9 +10,6 @@ agenda_item: can_manage: can_see_internal: can_see: - can_manage_moderator_notes: - can_see_moderator_notes: - can_see: assignment: can_manage: can_nominate_other: @@ -25,6 +22,9 @@ list_of_speakers: can_manage: can_see: can_be_speaker: + can_manage_moderator_notes: + can_see_moderator_notes: + can_see: mediafile: can_manage: can_see: From f4bfb7628e59216d7622e297d12c487d3dc3c2d0 Mon Sep 17 00:00:00 2001 From: Luisa Date: Wed, 4 Sep 2024 16:38:14 +0200 Subject: [PATCH 2/3] Remove can_see from can_see_moderator_note --- permission.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/permission.yml b/permission.yml index a1ebfde6..998284b2 100644 --- a/permission.yml +++ b/permission.yml @@ -24,7 +24,6 @@ list_of_speakers: can_be_speaker: can_manage_moderator_notes: can_see_moderator_notes: - can_see: mediafile: can_manage: can_see: From 48ee527c447803a3fc3fe883600b98eb7f482e7f Mon Sep 17 00:00:00 2001 From: Luisa Date: Thu, 5 Sep 2024 11:44:40 +0200 Subject: [PATCH 3/3] Restriction mode --- models.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models.yml b/models.yml index 797d85d9..b529e669 100644 --- a/models.yml +++ b/models.yml @@ -2190,7 +2190,7 @@ list_of_speakers: constant: true moderator_notes: type: HTMLStrict - restriction_mode: D + restriction_mode: B content_object_id: type: generic-relation