IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(invite): trying to get username to work as well

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-07-29 09:30:23 +02:00
parent 6d6af09296
commit 5a160f426e
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/org_invite.go
View File

@ -134,6 +134,9 @@ func CompleteInvite(c *middleware.Context, completeInvite dtos.CompleteInviteFor
} }
invite := query.Result invite := query.Result
if invite.Status != m.TmpUserInvitePending {
return ApiError(412, fmt.Sprintf("Invite cannot be used in status %s", invite.Status), nil)
}
cmd := m.CreateUserCommand{ cmd := m.CreateUserCommand{
Email: completeInvite.Email, Email: completeInvite.Email,
@ -164,6 +167,7 @@ func CompleteInvite(c *middleware.Context, completeInvite dtos.CompleteInviteFor
loginUserWithUser(&user, c) loginUserWithUser(&user, c)
metrics.M_Api_User_SignUp.Inc(1) metrics.M_Api_User_SignUp.Inc(1)
metrics.M_Api_User_SignUpInvite.Inc(1)
return ApiSuccess("User created and logged in") return ApiSuccess("User created and logged in")
} }

1
pkg/metrics/metrics.go
View File

@ -14,6 +14,7 @@ var (
M_Api_Status_404 = NewComboCounterRef("api.status.404") M_Api_Status_404 = NewComboCounterRef("api.status.404")
M_Api_User_SignUp = NewComboCounterRef("api.user.signup") M_Api_User_SignUp = NewComboCounterRef("api.user.signup")
M_Api_User_SignUpInvite = NewComboCounterRef("api.user.signup_invite")
M_Api_Dashboard_Get = NewComboCounterRef("api.dashboard.get") M_Api_Dashboard_Get = NewComboCounterRef("api.dashboard.get")
M_Api_Dashboard_Post = NewComboCounterRef("api.dashboard.post") M_Api_Dashboard_Post = NewComboCounterRef("api.dashboard.post")
M_Api_Admin_User_Create = NewComboCounterRef("api.admin.user_create") M_Api_Admin_User_Create = NewComboCounterRef("api.admin.user_create")

6
public/app/features/org/partials/invite.html
View File

@ -5,11 +5,11 @@
</a> </a>
<h3> <h3>
Invite Users Add or Invite Users
</h3> </h3>
<div class="modal-tagline"> <div class="modal-tagline">
Invite new or existing Grafana users to the organization Invite new or add existing Grafana users to the organization
<span class="highlight-word">{{contextSrv.user.orgName}}</span> <span class="highlight-word">{{contextSrv.user.orgName}}</span>
</div> </div>
@ -22,7 +22,7 @@
<div class="tight-form" ng-repeat="invite in invites"> <div class="tight-form" ng-repeat="invite in invites">
<ul class="tight-form-list"> <ul class="tight-form-list">
<li class="tight-form-item"> <li class="tight-form-item">
Email Email or Username
</li> </li>
<li> <li>
<input type="email" ng-model="invite.email" required <input type="email" ng-model="invite.email" required

3
public/app/features/org/partials/orgUsers.html
View File

@ -10,7 +10,8 @@
<h2>Organization users</h2> <h2>Organization users</h2>
<button class="btn btn-success pull-right" ng-click="openInviteModal()"> <button class="btn btn-success pull-right" ng-click="openInviteModal()">
Invite Users <i class="fa fa-plus"></i>
Add or Invite
</button> </button>
<br> <br>

2
public/css/less/login.less
View File

@ -102,7 +102,7 @@
height: 100%; height: 100%;
width: 100%; width: 100%;
background-image: url(/img/background_tease.jpg); background-image: url(/img/background_tease.jpg);
opacity: 0.15; opacity: 0.05;
z-index: -1; z-index: -1;
} }