From 6ed1cf8385144474df48810487d8568b68d0b663 Mon Sep 17 00:00:00 2001 From: Michael Derynck Date: Wed, 14 Feb 2024 07:17:01 -0700 Subject: [PATCH] Fix edit default team by admin (#3885) # What this PR does Fixes issue where when an admin edits the default team of another user it would change the admin's default team instead of the selected user. ## Which issue(s) this PR fixes #3819 ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required) --- CHANGELOG.md | 8 ++++++-- .../UserSettings/parts/tabs/UserInfoTab/UserInfoTab.tsx | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4679468a..330b73d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +### Fixed + +- Fix edit default team by admin @mderynck ([#3885](https://github.com/grafana/oncall/pull/3885)) +- Unblock slack install by skipping check chatops gateway link in OSS deployment @mderynck ([#3893](https://github.com/grafana/oncall/pull/3893)) + ## v1.3.105 (2024-02-13) ### Fixed -- Quotes in templates not rendering results correctly ([#3884](https://github.com/grafana/oncall/pull/3884)) -- Unblock slack install by skipping check chatops gateway link in OSS deployment @mderynck ([#3893](https://github.com/grafana/oncall/pull/3893)) +- Quotes in templates not rendering results correctly @mderynck ([#3884](https://github.com/grafana/oncall/pull/3884)) ## v1.3.104 (2024-02-12) diff --git a/grafana-plugin/src/containers/UserSettings/parts/tabs/UserInfoTab/UserInfoTab.tsx b/grafana-plugin/src/containers/UserSettings/parts/tabs/UserInfoTab/UserInfoTab.tsx index c7d2b187..a23f4605 100644 --- a/grafana-plugin/src/containers/UserSettings/parts/tabs/UserInfoTab/UserInfoTab.tsx +++ b/grafana-plugin/src/containers/UserSettings/parts/tabs/UserInfoTab/UserInfoTab.tsx @@ -50,7 +50,7 @@ export const UserInfoTab = (props: UserInfoTabProps) => { withoutModal defaultValue={storeUser.current_team} onSelect={async (value) => { - await userStore.updateCurrentUser({ current_team: value }); + await userStore.updateUser({ pk: storeUser.pk, current_team: value }); store.grafanaTeamStore.updateItems(); }} />