Skip to content

Commit b27a158

Browse files
Fix /escalate predefined org (#4723)
Related to grafana/oncall-gateway#276 Co-authored-by: Innokentii Konstantinov <[email protected]>
1 parent 9da5b94 commit b27a158

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

engine/apps/slack/scenarios/paging.py

+16-11
Original file line numberDiff line numberDiff line change
@@ -312,19 +312,20 @@ def process_scenario(
312312
if not user_is_oncall(selected_user):
313313
# display additional confirmation modal
314314
metadata = json.loads(payload["view"]["private_metadata"])
315-
private_metadata = make_private_metadata(
316-
{
317-
"state": payload["view"]["state"],
318-
"input_id_prefix": metadata["input_id_prefix"],
319-
"channel_id": metadata["channel_id"],
320-
"submit_routing_uid": metadata["submit_routing_uid"],
321-
DataKey.USERS: metadata[DataKey.USERS],
322-
},
323-
selected_user.organization,
324-
)
315+
private_metadata = {
316+
"state": payload["view"]["state"],
317+
"input_id_prefix": metadata["input_id_prefix"],
318+
"channel_id": metadata["channel_id"],
319+
"submit_routing_uid": metadata["submit_routing_uid"],
320+
DataKey.USERS: metadata[DataKey.USERS],
321+
}
322+
# keep predefined organization in private metadata
323+
if "organization_id" in metadata:
324+
private_metadata["organization_id"] = metadata["organization_id"]
325325

326326
view = _display_confirm_participant_invitation_view(
327-
OnPagingConfirmUserChange.routing_uid(), private_metadata
327+
OnPagingConfirmUserChange.routing_uid(),
328+
make_private_metadata(private_metadata, selected_user.organization),
328329
)
329330
self._slack_client.views_push(trigger_id=payload["trigger_id"], view=view)
330331
else:
@@ -392,6 +393,10 @@ def process_scenario(
392393
"submit_routing_uid": metadata["submit_routing_uid"],
393394
DataKey.USERS: metadata[DataKey.USERS],
394395
}
396+
# keep predefined organization in private metadata
397+
if "organization_id" in metadata:
398+
private_metadata["organization_id"] = metadata["organization_id"]
399+
395400
previous_view_payload = {
396401
"view": {
397402
"state": metadata["state"],

0 commit comments

Comments
 (0)