Skip to content

Commit f76237a

Browse files
authored
Merge pull request #265 from neinteractiveliterature/can-update-admin-notes
Allow admins to update event proposal admin notes
2 parents 2c1d8ec + 6310c25 commit f76237a

3 files changed

Lines changed: 24 additions & 3 deletions

File tree

crates/intercode_events/src/partial_objects/ability_events_fields.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,21 @@ impl AbilityEventsFields {
181181
.await
182182
}
183183

184+
#[graphql(name = "can_update_admin_notes_on_event_proposal")]
185+
async fn can_update_admin_notes_on_event_proposal(
186+
&self,
187+
ctx: &Context<'_>,
188+
event_proposal_id: ID,
189+
) -> Result<bool, Error> {
190+
self
191+
.can_perform_event_proposal_action(
192+
ctx,
193+
event_proposal_id,
194+
&EventProposalAction::UpdateAdminNotes,
195+
)
196+
.await
197+
}
198+
184199
#[graphql(name = "can_update_event_proposal")]
185200
async fn can_update_event_proposal(
186201
&self,

crates/intercode_graphql/src/api/merged_objects/event_proposal_type.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,6 @@ merged_model_backed_type!(
4343
event_proposals::Model,
4444
"EventProposal",
4545
EventProposalGlueFields,
46+
EventProposalEventsFields,
4647
EventProposalFormsFields
4748
);

crates/intercode_policies/src/policies/event_proposal_policy.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,15 @@ impl Policy<AuthorizationInfo, (conventions::Model, event_proposals::Model)>
183183
.await?
184184
|| principal.site_admin_read()))),
185185
),
186-
EventProposalAction::ReadAdminNotes => Ok(
186+
EventProposalAction::ReadAdminNotes | EventProposalAction::UpdateAdminNotes => Ok(
187187
(principal.has_scope("read_events")
188-
&& has_applicable_permission("read_admin_notes", principal, convention, event_proposal)
189-
.await?)
188+
&& has_applicable_permission(
189+
"access_admin_notes",
190+
principal,
191+
convention,
192+
event_proposal,
193+
)
194+
.await?)
190195
|| principal.site_admin_read(),
191196
),
192197
EventProposalAction::Update => Ok(

0 commit comments

Comments
 (0)