diff --git a/pkg/api/account.go b/pkg/api/account.go
index 6c97b90c350..98fb173af6f 100644
--- a/pkg/api/account.go
+++ b/pkg/api/account.go
@@ -6,7 +6,7 @@ import (
m "github.com/grafana/grafana/pkg/models"
)
-func GetAccount(c *middleware.Context) {
+func GetOrg(c *middleware.Context) {
query := m.GetAccountByIdQuery{Id: c.AccountId}
if err := bus.Dispatch(&query); err != nil {
@@ -27,7 +27,7 @@ func GetAccount(c *middleware.Context) {
c.JSON(200, &account)
}
-func CreateAccount(c *middleware.Context, cmd m.CreateAccountCommand) {
+func CreateOrg(c *middleware.Context, cmd m.CreateAccountCommand) {
cmd.UserId = c.UserId
if err := bus.Dispatch(&cmd); err != nil {
@@ -38,7 +38,7 @@ func CreateAccount(c *middleware.Context, cmd m.CreateAccountCommand) {
c.JsonOK("Account created")
}
-func UpdateAccount(c *middleware.Context, cmd m.UpdateAccountCommand) {
+func UpdateOrg(c *middleware.Context, cmd m.UpdateAccountCommand) {
cmd.AccountId = c.AccountId
if err := bus.Dispatch(&cmd); err != nil {
diff --git a/pkg/api/account_users.go b/pkg/api/account_users.go
index ef2ad1a84db..3996220a6ac 100644
--- a/pkg/api/account_users.go
+++ b/pkg/api/account_users.go
@@ -6,7 +6,7 @@ import (
m "github.com/grafana/grafana/pkg/models"
)
-func AddAccountUser(c *middleware.Context, cmd m.AddAccountUserCommand) {
+func AddOrgUser(c *middleware.Context, cmd m.AddAccountUserCommand) {
if !cmd.Role.IsValid() {
c.JsonApiErr(400, "Invalid role specified", nil)
return
@@ -37,7 +37,7 @@ func AddAccountUser(c *middleware.Context, cmd m.AddAccountUserCommand) {
c.JsonOK("User added to account")
}
-func GetAccountUsers(c *middleware.Context) {
+func GetOrgUsers(c *middleware.Context) {
query := m.GetAccountUsersQuery{AccountId: c.AccountId}
if err := bus.Dispatch(&query); err != nil {
@@ -48,7 +48,7 @@ func GetAccountUsers(c *middleware.Context) {
c.JSON(200, query.Result)
}
-func RemoveAccountUser(c *middleware.Context) {
+func RemoveOrgUser(c *middleware.Context) {
userId := c.ParamsInt64(":id")
cmd := m.RemoveAccountUserCommand{AccountId: c.AccountId, UserId: userId}
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 84fee61005f..72504e340d6 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -54,13 +54,13 @@ func Register(r *macaron.Macaron) {
})
// account
- r.Group("/account", func() {
- r.Get("/", GetAccount)
- r.Post("/", bind(m.CreateAccountCommand{}), CreateAccount)
- r.Put("/", bind(m.UpdateAccountCommand{}), UpdateAccount)
- r.Post("/users", bind(m.AddAccountUserCommand{}), AddAccountUser)
- r.Get("/users", GetAccountUsers)
- r.Delete("/users/:id", RemoveAccountUser)
+ r.Group("/org", func() {
+ r.Get("/", GetOrg)
+ r.Post("/", bind(m.CreateAccountCommand{}), CreateOrg)
+ r.Put("/", bind(m.UpdateAccountCommand{}), UpdateOrg)
+ r.Post("/users", bind(m.AddAccountUserCommand{}), AddOrgUser)
+ r.Get("/users", GetOrgUsers)
+ r.Delete("/users/:id", RemoveOrgUser)
}, reqAccountAdmin)
// auth api keys
diff --git a/src/app/controllers/sidemenuCtrl.js b/src/app/controllers/sidemenuCtrl.js
index df41138a0ae..e962a35af35 100644
--- a/src/app/controllers/sidemenuCtrl.js
+++ b/src/app/controllers/sidemenuCtrl.js
@@ -26,10 +26,10 @@ function (angular, _, $, config) {
$scope.menu.push({
text: "Data Sources",
icon: "fa fa-fw fa-database",
- href: $scope.getUrl("/account/datasources"),
+ href: $scope.getUrl("/datasources"),
});
$scope.menu.push({
- text: "Organization", href: $scope.getUrl("/account"),
+ text: "Organization", href: $scope.getUrl("/org"),
icon: "fa fa-fw fa-users",
});
}
diff --git a/src/app/features/account/accountCtrl.js b/src/app/features/account/accountCtrl.js
deleted file mode 100644
index 8d4130bda03..00000000000
--- a/src/app/features/account/accountCtrl.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define([
- 'angular',
-],
-function (angular) {
- 'use strict';
-
- var module = angular.module('grafana.controllers');
-
- module.controller('AccountCtrl', function($scope, $http, backendSrv) {
-
- $scope.init = function() {
- $scope.getAccount();
- };
-
- $scope.getAccount = function() {
- backendSrv.get('/api/account').then(function(account) {
- $scope.account = account;
- });
- };
-
- $scope.update = function() {
- if (!$scope.accountForm.$valid) { return; }
- backendSrv.put('/api/account', $scope.account).then($scope.getAccount);
- };
-
- $scope.init();
-
- });
-});
diff --git a/src/app/features/all.js b/src/app/features/all.js
index 004d3eebe9f..89d66188688 100644
--- a/src/app/features/all.js
+++ b/src/app/features/all.js
@@ -10,7 +10,7 @@ define([
'./panel/all',
'./profile/profileCtrl',
'./profile/changePasswordCtrl',
- './account/all',
+ './org/all',
'./admin/all',
'./grafanaDatasource/datasource',
], function () {});
diff --git a/src/app/features/account/all.js b/src/app/features/org/all.js
similarity index 54%
rename from src/app/features/account/all.js
rename to src/app/features/org/all.js
index b2c7b2962e9..6a8cd68ae47 100644
--- a/src/app/features/account/all.js
+++ b/src/app/features/org/all.js
@@ -1,7 +1,7 @@
define([
- './accountUsersCtrl',
'./datasourcesCtrl',
'./datasourceEditCtrl',
- './apiKeysCtrl',
- './accountCtrl',
+ './orgUsersCtrl',
+ './orgApiKeysCtrl',
+ './orgDetailsCtrl',
], function () {});
diff --git a/src/app/features/account/datasourceEditCtrl.js b/src/app/features/org/datasourceEditCtrl.js
similarity index 100%
rename from src/app/features/account/datasourceEditCtrl.js
rename to src/app/features/org/datasourceEditCtrl.js
diff --git a/src/app/features/account/datasourcesCtrl.js b/src/app/features/org/datasourcesCtrl.js
similarity index 100%
rename from src/app/features/account/datasourcesCtrl.js
rename to src/app/features/org/datasourcesCtrl.js
diff --git a/src/app/features/account/apiKeysCtrl.js b/src/app/features/org/orgApiKeysCtrl.js
similarity index 90%
rename from src/app/features/account/apiKeysCtrl.js
rename to src/app/features/org/orgApiKeysCtrl.js
index f4ec0d681e8..fa77441d7b5 100644
--- a/src/app/features/account/apiKeysCtrl.js
+++ b/src/app/features/org/orgApiKeysCtrl.js
@@ -6,7 +6,7 @@ function (angular) {
var module = angular.module('grafana.controllers');
- module.controller('ApiKeysCtrl', function($scope, $http, backendSrv) {
+ module.controller('OrgApiKeysCtrl', function($scope, $http, backendSrv) {
$scope.roleTypes = ['Viewer', 'Editor', 'Admin'];
$scope.token = { role: 'Viewer' };
diff --git a/src/app/features/org/orgDetailsCtrl.js b/src/app/features/org/orgDetailsCtrl.js
new file mode 100644
index 00000000000..ab0f8be4078
--- /dev/null
+++ b/src/app/features/org/orgDetailsCtrl.js
@@ -0,0 +1,29 @@
+define([
+ 'angular',
+],
+function (angular) {
+ 'use strict';
+
+ var module = angular.module('grafana.controllers');
+
+ module.controller('OrgDetailsCtrl', function($scope, $http, backendSrv) {
+
+ $scope.init = function() {
+ $scope.getOrgInfo();
+ };
+
+ $scope.getOrgInfo = function() {
+ backendSrv.get('/api/org').then(function(account) {
+ $scope.org = account;
+ });
+ };
+
+ $scope.update = function() {
+ if (!$scope.orgForm.$valid) { return; }
+ backendSrv.put('/api/org', $scope.org).then($scope.getOrgInfo);
+ };
+
+ $scope.init();
+
+ });
+});
diff --git a/src/app/features/account/accountUsersCtrl.js b/src/app/features/org/orgUsersCtrl.js
similarity index 63%
rename from src/app/features/account/accountUsersCtrl.js
rename to src/app/features/org/orgUsersCtrl.js
index 65ad8bcf847..d679a8dab98 100644
--- a/src/app/features/account/accountUsersCtrl.js
+++ b/src/app/features/org/orgUsersCtrl.js
@@ -6,7 +6,7 @@ function (angular) {
var module = angular.module('grafana.controllers');
- module.controller('AccountUsersCtrl', function($scope, $http, backendSrv) {
+ module.controller('OrgUsersCtrl', function($scope, $http, backendSrv) {
$scope.user = {
loginOrEmail: '',
@@ -18,18 +18,18 @@ function (angular) {
};
$scope.get = function() {
- backendSrv.get('/api/account/users').then(function(users) {
+ backendSrv.get('/api/org/users').then(function(users) {
$scope.users = users;
});
};
$scope.removeUser = function(user) {
- backendSrv.delete('/api/account/users/' + user.userId).then($scope.get);
+ backendSrv.delete('/api/org/users/' + user.userId).then($scope.get);
};
$scope.addUser = function() {
if (!$scope.form.$valid) { return; }
- backendSrv.post('/api/account/users', $scope.user).then($scope.get);
+ backendSrv.post('/api/org/users', $scope.user).then($scope.get);
};
$scope.init();
diff --git a/src/app/features/account/partials/datasourceEdit.html b/src/app/features/org/partials/datasourceEdit.html
similarity index 100%
rename from src/app/features/account/partials/datasourceEdit.html
rename to src/app/features/org/partials/datasourceEdit.html
diff --git a/src/app/features/account/partials/datasources.html b/src/app/features/org/partials/datasources.html
similarity index 90%
rename from src/app/features/account/partials/datasources.html
rename to src/app/features/org/partials/datasources.html
index 7ab7efd077f..6a41ed03136 100644
--- a/src/app/features/account/partials/datasources.html
+++ b/src/app/features/org/partials/datasources.html
@@ -1,7 +1,7 @@
diff --git a/src/app/features/account/partials/apikeys.html b/src/app/features/org/partials/orgApiKeys.html
similarity index 100%
rename from src/app/features/account/partials/apikeys.html
rename to src/app/features/org/partials/orgApiKeys.html
diff --git a/src/app/features/account/partials/account.html b/src/app/features/org/partials/orgDetails.html
similarity index 83%
rename from src/app/features/account/partials/account.html
rename to src/app/features/org/partials/orgDetails.html
index a8f01edaf6a..59df2042aab 100644
--- a/src/app/features/account/partials/account.html
+++ b/src/app/features/org/partials/orgDetails.html
@@ -1,7 +1,7 @@
@@ -15,10 +15,10 @@