feat(invite): more work on invite, basic creation works, added new tab directive from angular-ui and made new tab style, #2353

This commit is contained in:
Torkel Ödegaard
2015-07-17 09:51:34 +02:00
parent 444807c35b
commit 0ffcce1b5d
20 changed files with 488 additions and 57 deletions
+4
View File
@@ -89,6 +89,10 @@ func Register(r *macaron.Macaron) {
r.Get("/users", wrap(GetOrgUsersForCurrentOrg))
r.Patch("/users/:userId", bind(m.UpdateOrgUserCommand{}), wrap(UpdateOrgUserForCurrentOrg))
r.Delete("/users/:userId", wrap(RemoveOrgUserForCurrentOrg))
// invites
r.Get("/invites", wrap(GetPendingOrgInvites))
r.Post("/invites", bind(dtos.AddInviteForm{}), wrap(AddOrgInvite))
}, regOrgAdmin)
// create new org
+9
View File
@@ -0,0 +1,9 @@
package dtos
import m "github.com/grafana/grafana/pkg/models"
type AddInviteForm struct {
Email string `json:"email" binding:"Required"`
Name string `json:"name"`
Role m.RoleType `json:"role" binding:"Required"`
}
+39
View File
@@ -0,0 +1,39 @@
package api
import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/util"
)
func GetPendingOrgInvites(c *middleware.Context) Response {
query := m.GetTempUsersForOrgQuery{OrgId: c.OrgId}
if err := bus.Dispatch(&query); err != nil {
return ApiError(500, "Failed to get invites from db", err)
}
return Json(200, query.Result)
}
func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response {
if !inviteDto.Role.IsValid() {
return ApiError(400, "Invalid role specified", nil)
}
cmd := m.CreateTempUserCommand{}
cmd.OrgId = c.OrgId
cmd.Email = inviteDto.Email
cmd.Name = inviteDto.Name
cmd.IsInvite = true
cmd.InvitedByUserId = c.UserId
cmd.Code = util.GetRandomString(30)
if err := bus.Dispatch(&cmd); err != nil {
return ApiError(500, "Failed to save invite to database", err)
}
return ApiSuccess("ok, done!")
}