diff --git a/pkg/services/sqlstore/team.go b/pkg/services/sqlstore/team.go index 0a5383d993f..f7f7d7fc2cb 100644 --- a/pkg/services/sqlstore/team.go +++ b/pkg/services/sqlstore/team.go @@ -272,7 +272,7 @@ func UpdateTeamMember(cmd *m.UpdateTeamMemberCommand) error { } member.Permission = cmd.Permission - _, err = sess.Where("org_id=? and team_id=? and user_id=?", cmd.OrgId, cmd.TeamId, cmd.UserId).Update(member) + _, err = sess.Cols("permission").Where("org_id=? and team_id=? and user_id=?", cmd.OrgId, cmd.TeamId, cmd.UserId).Update(member) return err }) diff --git a/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap b/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap index c356727ebeb..01d7b40ec61 100644 --- a/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap +++ b/public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap @@ -218,7 +218,7 @@ exports[`Render should render team members 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, }, Object { "description": "Can add/remove permissions and delete team.", @@ -231,7 +231,7 @@ exports[`Render should render team members 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, } } width={null} @@ -288,7 +288,7 @@ exports[`Render should render team members 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, }, Object { "description": "Can add/remove permissions and delete team.", @@ -301,7 +301,7 @@ exports[`Render should render team members 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, } } width={null} @@ -358,7 +358,7 @@ exports[`Render should render team members 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, }, Object { "description": "Can add/remove permissions and delete team.", @@ -371,7 +371,7 @@ exports[`Render should render team members 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, } } width={null} @@ -428,7 +428,7 @@ exports[`Render should render team members 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, }, Object { "description": "Can add/remove permissions and delete team.", @@ -441,7 +441,7 @@ exports[`Render should render team members 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, } } width={null} @@ -498,7 +498,7 @@ exports[`Render should render team members 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, }, Object { "description": "Can add/remove permissions and delete team.", @@ -511,7 +511,7 @@ exports[`Render should render team members 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, } } width={null} @@ -661,7 +661,7 @@ exports[`Render should render team members when sync enabled 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, }, Object { "description": "Can add/remove permissions and delete team.", @@ -674,7 +674,7 @@ exports[`Render should render team members when sync enabled 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, } } width={null} @@ -747,7 +747,7 @@ exports[`Render should render team members when sync enabled 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, }, Object { "description": "Can add/remove permissions and delete team.", @@ -760,7 +760,7 @@ exports[`Render should render team members when sync enabled 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, } } width={null} @@ -833,7 +833,7 @@ exports[`Render should render team members when sync enabled 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, }, Object { "description": "Can add/remove permissions and delete team.", @@ -846,7 +846,7 @@ exports[`Render should render team members when sync enabled 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, } } width={null} @@ -919,7 +919,7 @@ exports[`Render should render team members when sync enabled 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, }, Object { "description": "Can add/remove permissions and delete team.", @@ -932,7 +932,7 @@ exports[`Render should render team members when sync enabled 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, } } width={null} @@ -1005,7 +1005,7 @@ exports[`Render should render team members when sync enabled 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, }, Object { "description": "Can add/remove permissions and delete team.", @@ -1018,7 +1018,7 @@ exports[`Render should render team members when sync enabled 1`] = ` Object { "description": "Is team member", "label": "Member", - "value": 1, + "value": 0, } } width={null} diff --git a/public/app/types/acl.ts b/public/app/types/acl.ts index 12016732222..8134ddb1749 100644 --- a/public/app/types/acl.ts +++ b/public/app/types/acl.ts @@ -100,7 +100,7 @@ export const dashboardPermissionLevels: DashboardPermissionInfo[] = [ ]; export enum TeamPermissionLevel { - Member = 1, + Member = 0, Admin = 4, }