opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-22 10:12:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

teams: change back to permissionlevel for Member to 0

Browse Source
This commit is contained in:
Hugo Häggmark
2019-03-08 13:53:42 +01:00
committed by Leonard Gram
parent 1315a67022
commit 3c46b786d2
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/sqlstore/team.go
View File

@ -272,7 +272,7 @@ func UpdateTeamMember(cmd *m.UpdateTeamMemberCommand) error {
} }
member.Permission = cmd.Permission 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 return err
}) })

40
public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap
View File

@ -218,7 +218,7 @@ exports[`Render should render team members 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
}, },
Object { Object {
"description": "Can add/remove permissions and delete team.", "description": "Can add/remove permissions and delete team.",
@ -231,7 +231,7 @@ exports[`Render should render team members 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
} }
} }
width={null} width={null}
@ -288,7 +288,7 @@ exports[`Render should render team members 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
}, },
Object { Object {
"description": "Can add/remove permissions and delete team.", "description": "Can add/remove permissions and delete team.",
@ -301,7 +301,7 @@ exports[`Render should render team members 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
} }
} }
width={null} width={null}
@ -358,7 +358,7 @@ exports[`Render should render team members 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
}, },
Object { Object {
"description": "Can add/remove permissions and delete team.", "description": "Can add/remove permissions and delete team.",
@ -371,7 +371,7 @@ exports[`Render should render team members 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
} }
} }
width={null} width={null}
@ -428,7 +428,7 @@ exports[`Render should render team members 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
}, },
Object { Object {
"description": "Can add/remove permissions and delete team.", "description": "Can add/remove permissions and delete team.",
@ -441,7 +441,7 @@ exports[`Render should render team members 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
} }
} }
width={null} width={null}
@ -498,7 +498,7 @@ exports[`Render should render team members 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
}, },
Object { Object {
"description": "Can add/remove permissions and delete team.", "description": "Can add/remove permissions and delete team.",
@ -511,7 +511,7 @@ exports[`Render should render team members 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
} }
} }
width={null} width={null}
@ -661,7 +661,7 @@ exports[`Render should render team members when sync enabled 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
}, },
Object { Object {
"description": "Can add/remove permissions and delete team.", "description": "Can add/remove permissions and delete team.",
@ -674,7 +674,7 @@ exports[`Render should render team members when sync enabled 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
} }
} }
width={null} width={null}
@ -747,7 +747,7 @@ exports[`Render should render team members when sync enabled 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
}, },
Object { Object {
"description": "Can add/remove permissions and delete team.", "description": "Can add/remove permissions and delete team.",
@ -760,7 +760,7 @@ exports[`Render should render team members when sync enabled 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
} }
} }
width={null} width={null}
@ -833,7 +833,7 @@ exports[`Render should render team members when sync enabled 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
}, },
Object { Object {
"description": "Can add/remove permissions and delete team.", "description": "Can add/remove permissions and delete team.",
@ -846,7 +846,7 @@ exports[`Render should render team members when sync enabled 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
} }
} }
width={null} width={null}
@ -919,7 +919,7 @@ exports[`Render should render team members when sync enabled 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
}, },
Object { Object {
"description": "Can add/remove permissions and delete team.", "description": "Can add/remove permissions and delete team.",
@ -932,7 +932,7 @@ exports[`Render should render team members when sync enabled 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
} }
} }
width={null} width={null}
@ -1005,7 +1005,7 @@ exports[`Render should render team members when sync enabled 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
}, },
Object { Object {
"description": "Can add/remove permissions and delete team.", "description": "Can add/remove permissions and delete team.",
@ -1018,7 +1018,7 @@ exports[`Render should render team members when sync enabled 1`] = `
Object { Object {
"description": "Is team member", "description": "Is team member",
"label": "Member", "label": "Member",
"value": 1, "value": 0,
} }
} }
width={null} width={null}

2
public/app/types/acl.ts
View File

@ -100,7 +100,7 @@ export const dashboardPermissionLevels: DashboardPermissionInfo[] = [
]; ];
export enum TeamPermissionLevel { export enum TeamPermissionLevel {
Member = 1, Member = 0,
Admin = 4, Admin = 4,
} }