Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
3c46b786
Commit
3c46b786
authored
Mar 08, 2019
by
Hugo Häggmark
Committed by
Leonard Gram
Mar 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
teams: change back to permissionlevel for Member to 0
parent
1315a670
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
22 deletions
+22
-22
pkg/services/sqlstore/team.go
+1
-1
public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap
+20
-20
public/app/types/acl.ts
+1
-1
No files found.
pkg/services/sqlstore/team.go
View file @
3c46b786
...
...
@@ -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
})
...
...
public/app/features/teams/__snapshots__/TeamMembers.test.tsx.snap
View file @
3c46b786
...
...
@@ -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}
...
...
public/app/types/acl.ts
View file @
3c46b786
...
...
@@ -100,7 +100,7 @@ export const dashboardPermissionLevels: DashboardPermissionInfo[] = [
];
export
enum
TeamPermissionLevel
{
Member
=
1
,
Member
=
0
,
Admin
=
4
,
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment