From 74bf1f23fb8e217e82aff0c9d7b5e697e0e6a9e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Tue, 19 May 2015 09:09:21 +0200
Subject: [PATCH] Small progress on #2014

---
 pkg/api/api.go                                   |  2 +-
 public/app/features/admin/adminEditUserCtrl.js   |  7 +++++++
 .../app/features/admin/partials/edit_user.html   | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index 0503ac61a3c..f45da26d9c2 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -67,7 +67,7 @@ func Register(r *macaron.Macaron) {
 		// users
 		r.Group("/users", func() {
 			r.Get("/:id", wrap(GetUserById))
-			r.Get("/:id/org", wrap(GetUserOrgList))
+			r.Get("/:id/orgs", wrap(GetUserOrgList))
 			r.Put("/:id", bind(m.UpdateUserCommand{}), wrap(UpdateUser))
 		}, reqGrafanaAdmin)
 
diff --git a/public/app/features/admin/adminEditUserCtrl.js b/public/app/features/admin/adminEditUserCtrl.js
index 72a7dba0229..dc8839f0f84 100644
--- a/public/app/features/admin/adminEditUserCtrl.js
+++ b/public/app/features/admin/adminEditUserCtrl.js
@@ -13,6 +13,7 @@ function (angular) {
     $scope.init = function() {
       if ($routeParams.id) {
         $scope.getUser($routeParams.id);
+        $scope.getUserOrgs($routeParams.id);
       }
     };
 
@@ -49,6 +50,12 @@ function (angular) {
       });
     };
 
+    $scope.getUserOrgs = function(id) {
+      backendSrv.get('/api/users/' + id + '/orgs').then(function(orgs) {
+        $scope.orgs = orgs;
+      });
+    };
+
     $scope.update = function() {
       if (!$scope.userForm.$valid) { return; }
 
diff --git a/public/app/features/admin/partials/edit_user.html b/public/app/features/admin/partials/edit_user.html
index c82d7705b8d..712aee26d5d 100644
--- a/public/app/features/admin/partials/edit_user.html
+++ b/public/app/features/admin/partials/edit_user.html
@@ -94,5 +94,21 @@
 		<br>
 		<button type="submit" class="pull-right btn btn-success" ng-click="updatePermissions()">Update</button>
 
+		<h2>
+			Organizations
+		</h2>
+
+		<table class="grafana-options-table">
+			<tr ng-repeat="org in orgs">
+				<td style="width: 98%"><strong>Name: </strong> {{org.name}}</td>
+				<td><strong>Role: </strong> {{org.role}}</td>
+				<td class="nobg max-width-btns">
+					<span class="label label-info" ng-show="org.orgId === user.orgId">
+						Current
+					</span>
+				</td>
+			</tr>
+		</table>
+
 	</div>
 </div>