energylink/grafana

commit 590c3b4b50195cacf02fbd0456d55ef69db16b79
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date:   Mon Jan 19 19:10:04 2015 +0100

    Fixes to account users view

diff --git a/src/app/features/account/accountUsersCtrl.js b/src/app/features/account/accountUsersCtrl.js
index f167625a2..560b8ff4b 100644
--- a/src/app/features/account/accountUsersCtrl.js
+++ b/src/app/features/account/accountUsersCtrl.js
@@ -26,7 +26,7 @@ function (angular) {
     $scope.removeUser = function(user) {
       backendSrv.request({
         method: 'DELETE',
-        url: '/api/account/users/' + user.id,
+        url: '/api/account/users/' + user.userId
       }).then($scope.get);
     };
 
diff --git a/src/app/features/account/partials/users.html b/src/app/features/account/partials/users.html
index 87662c136..dc6becf45 100644
--- a/src/app/features/account/partials/users.html
+++ b/src/app/features/account/partials/users.html
@@ -26,7 +26,7 @@
 								role
 							</li>
 							<li>
-								<select type="text" ng-model="user.role" class="input-small tight-form-input" ng-options="f for f in ['viewer', 'editor', 'admin']">
+								<select type="text" ng-model="user.role" class="input-small tight-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Admin']">
 								</select>
 							</li>
 							<li>