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
a56f657f
Commit
a56f657f
authored
Nov 16, 2015
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3254 from utkarshcmu/user-id
/api/admin/users returns user ID in JSON response
parents
305f8d69
f5db9950
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
docs/sources/reference/http_api.md
+1
-1
pkg/api/admin_users.go
+8
-1
pkg/models/user.go
+5
-0
No files found.
docs/sources/reference/http_api.md
View file @
a56f657f
...
...
@@ -1388,7 +1388,7 @@ Create new user
HTTP/1.1 200
Content-Type: application/json
{"message":"User created"}
{"
id":5,"
message":"User created"}
### Password for User
...
...
pkg/api/admin_users.go
View file @
a56f657f
...
...
@@ -37,7 +37,14 @@ func AdminCreateUser(c *middleware.Context, form dtos.AdminCreateUserForm) {
metrics
.
M_Api_Admin_User_Create
.
Inc
(
1
)
c
.
JsonOK
(
"User created"
)
user
:=
cmd
.
Result
result
:=
m
.
UserIdDTO
{
Message
:
"User created"
,
Id
:
user
.
Id
,
}
c
.
JSON
(
200
,
result
)
}
func
AdminUpdateUserPassword
(
c
*
middleware
.
Context
,
form
dtos
.
AdminUpdateUserPasswordForm
)
{
...
...
pkg/models/user.go
View file @
a56f657f
...
...
@@ -157,3 +157,8 @@ type UserSearchHitDTO struct {
Email
string
`json:"email"`
IsAdmin
bool
`json:"isAdmin"`
}
type
UserIdDTO
struct
{
Id
int64
`json:"id"`
Message
string
`json:"message"`
}
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