users view update

pkg/api/org_users.go

@@ -1,6 +1,7 @@
 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"
@@ -31,10 +32,6 @@ func addOrgUserHelper(cmd m.AddOrgUserCommand) Response {
 
 	userToAdd := userQuery.Result
 
-	// if userToAdd.Id == c.UserId {
-	// 	return ApiError(400, "Cannot add yourself as user", nil)
-	// }
-
 	cmd.UserId = userToAdd.Id
 
 	if err := bus.Dispatch(&cmd); err != nil {
@@ -64,6 +61,10 @@ func getOrgUsersHelper(orgId int64) Response {
 		return ApiError(500, "Failed to get account user", err)
 	}
 
+	for _, user := range query.Result {
+		user.AvatarUrl = dtos.GetGravatarUrl(user.Email)
+	}
+
 	return Json(200, query.Result)
 }
 

pkg/models/org_user.go

@@ -115,6 +115,7 @@ type OrgUserDTO struct {
 	OrgId         int64     `json:"orgId"`
 	UserId        int64     `json:"userId"`
 	Email         string    `json:"email"`
+	AvatarUrl     string    `json:"avatarUrl"`
 	Login         string    `json:"login"`
 	Role          string    `json:"role"`
 	LastSeenAt    time.Time `json:"lastSeenAt"`

public/app/features/org/partials/orgUsers.html

@@ -8,7 +8,6 @@
 		</h1>
 
 		<div class="page-header-tabs">
-
 			<button class="btn btn-success" ng-click="ctrl.openAddUsersView()" ng-hide="ctrl.externalUserMngLinkUrl">
 				<i class="fa fa-plus"></i>
         <span>{{ctrl.addUsersBtnName}}</span>
@@ -47,6 +46,7 @@
     <table class="filter-table form-inline">
       <thead>
         <tr>
+          <th></th>
           <th>Login</th>
           <th>Email</th>
 					<th>
@@ -58,6 +58,9 @@
         </tr>
       </thead>
       <tr ng-repeat="user in ctrl.users">
+        <td style="width-4 text-center">
+					<img class="filter-table__avatar" ng-src="{{user.avatarUrl}}"></img>
+				</td>
         <td>{{user.login}}</td>
         <td><span class="ellipsis">{{user.email}}</span></td>
 				<td>{{user.lastSeenAtAge}}</td>

public/sass/components/_filter-table.scss

@@ -53,4 +53,8 @@
   padding-bottom: 0;
 }
 
-
+.filter-table__avatar {
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+}