changed functions to arrowfunctions for only-arrow-functions rule (#13127)

This commit is contained in:
Patrick O'Carroll
2018-09-04 15:55:41 +02:00
committed by Torkel Ödegaard
parent 826dfceac0
commit 0f326f18dc
50 changed files with 816 additions and 820 deletions

View File

@@ -12,7 +12,7 @@ class AdminSettingsCtrl {
constructor($scope, backendSrv, navModelSrv) {
this.navModel = navModelSrv.getNav('cfg', 'admin', 'server-settings', 1);
backendSrv.get('/api/admin/settings').then(function(settings) {
backendSrv.get('/api/admin/settings').then(settings => {
$scope.settings = settings;
});
}

View File

@@ -3,7 +3,7 @@ import angular from 'angular';
export class AdminEditOrgCtrl {
/** @ngInject */
constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
$scope.init = function() {
$scope.init = () => {
$scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-orgs', 1);
if ($routeParams.id) {
@@ -12,34 +12,34 @@ export class AdminEditOrgCtrl {
}
};
$scope.getOrg = function(id) {
backendSrv.get('/api/orgs/' + id).then(function(org) {
$scope.getOrg = id => {
backendSrv.get('/api/orgs/' + id).then(org => {
$scope.org = org;
});
};
$scope.getOrgUsers = function(id) {
backendSrv.get('/api/orgs/' + id + '/users').then(function(orgUsers) {
$scope.getOrgUsers = id => {
backendSrv.get('/api/orgs/' + id + '/users').then(orgUsers => {
$scope.orgUsers = orgUsers;
});
};
$scope.update = function() {
$scope.update = () => {
if (!$scope.orgDetailsForm.$valid) {
return;
}
backendSrv.put('/api/orgs/' + $scope.org.id, $scope.org).then(function() {
backendSrv.put('/api/orgs/' + $scope.org.id, $scope.org).then(() => {
$location.path('/admin/orgs');
});
};
$scope.updateOrgUser = function(orgUser) {
$scope.updateOrgUser = orgUser => {
backendSrv.patch('/api/orgs/' + orgUser.orgId + '/users/' + orgUser.userId, orgUser);
};
$scope.removeOrgUser = function(orgUser) {
backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + orgUser.userId).then(function() {
$scope.removeOrgUser = orgUser => {
backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + orgUser.userId).then(() => {
$scope.getOrgUsers($scope.org.id);
});
};

View File

@@ -9,72 +9,72 @@ export class AdminEditUserCtrl {
$scope.permissions = {};
$scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-users', 1);
$scope.init = function() {
$scope.init = () => {
if ($routeParams.id) {
$scope.getUser($routeParams.id);
$scope.getUserOrgs($routeParams.id);
}
};
$scope.getUser = function(id) {
backendSrv.get('/api/users/' + id).then(function(user) {
$scope.getUser = id => {
backendSrv.get('/api/users/' + id).then(user => {
$scope.user = user;
$scope.user_id = id;
$scope.permissions.isGrafanaAdmin = user.isGrafanaAdmin;
});
};
$scope.setPassword = function() {
$scope.setPassword = () => {
if (!$scope.passwordForm.$valid) {
return;
}
const payload = { password: $scope.password };
backendSrv.put('/api/admin/users/' + $scope.user_id + '/password', payload).then(function() {
backendSrv.put('/api/admin/users/' + $scope.user_id + '/password', payload).then(() => {
$location.path('/admin/users');
});
};
$scope.updatePermissions = function() {
$scope.updatePermissions = () => {
const payload = $scope.permissions;
backendSrv.put('/api/admin/users/' + $scope.user_id + '/permissions', payload).then(function() {
backendSrv.put('/api/admin/users/' + $scope.user_id + '/permissions', payload).then(() => {
$location.path('/admin/users');
});
};
$scope.create = function() {
$scope.create = () => {
if (!$scope.userForm.$valid) {
return;
}
backendSrv.post('/api/admin/users', $scope.user).then(function() {
backendSrv.post('/api/admin/users', $scope.user).then(() => {
$location.path('/admin/users');
});
};
$scope.getUserOrgs = function(id) {
backendSrv.get('/api/users/' + id + '/orgs').then(function(orgs) {
$scope.getUserOrgs = id => {
backendSrv.get('/api/users/' + id + '/orgs').then(orgs => {
$scope.orgs = orgs;
});
};
$scope.update = function() {
$scope.update = () => {
if (!$scope.userForm.$valid) {
return;
}
backendSrv.put('/api/users/' + $scope.user_id, $scope.user).then(function() {
backendSrv.put('/api/users/' + $scope.user_id, $scope.user).then(() => {
$location.path('/admin/users');
});
};
$scope.updateOrgUser = function(orgUser) {
backendSrv.patch('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id, orgUser).then(function() {});
$scope.updateOrgUser = orgUser => {
backendSrv.patch('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id, orgUser).then(() => {});
};
$scope.removeOrgUser = function(orgUser) {
backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id).then(function() {
$scope.removeOrgUser = orgUser => {
backendSrv.delete('/api/orgs/' + orgUser.orgId + '/users/' + $scope.user_id).then(() => {
$scope.getUser($scope.user_id);
$scope.getUserOrgs($scope.user_id);
});
@@ -82,19 +82,19 @@ export class AdminEditUserCtrl {
$scope.orgsSearchCache = [];
$scope.searchOrgs = function(queryStr, callback) {
$scope.searchOrgs = (queryStr, callback) => {
if ($scope.orgsSearchCache.length > 0) {
callback(_.map($scope.orgsSearchCache, 'name'));
return;
}
backendSrv.get('/api/orgs', { query: '' }).then(function(result) {
backendSrv.get('/api/orgs', { query: '' }).then(result => {
$scope.orgsSearchCache = result;
callback(_.map(result, 'name'));
});
};
$scope.addOrgUser = function() {
$scope.addOrgUser = () => {
if (!$scope.addOrgForm.$valid) {
return;
}
@@ -108,7 +108,7 @@ export class AdminEditUserCtrl {
$scope.newOrg.loginOrEmail = $scope.user.login;
backendSrv.post('/api/orgs/' + orgInfo.id + '/users/', $scope.newOrg).then(function() {
backendSrv.post('/api/orgs/' + orgInfo.id + '/users/', $scope.newOrg).then(() => {
$scope.getUser($scope.user_id);
$scope.getUserOrgs($scope.user_id);
});

View File

@@ -3,26 +3,26 @@ import angular from 'angular';
export class AdminListOrgsCtrl {
/** @ngInject */
constructor($scope, backendSrv, navModelSrv) {
$scope.init = function() {
$scope.init = () => {
$scope.navModel = navModelSrv.getNav('cfg', 'admin', 'global-orgs', 1);
$scope.getOrgs();
};
$scope.getOrgs = function() {
backendSrv.get('/api/orgs').then(function(orgs) {
$scope.getOrgs = () => {
backendSrv.get('/api/orgs').then(orgs => {
$scope.orgs = orgs;
});
};
$scope.deleteOrg = function(org) {
$scope.deleteOrg = org => {
$scope.appEvent('confirm-modal', {
title: 'Delete',
text: 'Do you want to delete organization ' + org.name + '?',
text2: 'All dashboards for this organization will be removed!',
icon: 'fa-trash',
yesText: 'Delete',
onConfirm: function() {
backendSrv.delete('/api/orgs/' + org.id).then(function() {
onConfirm: () => {
backendSrv.delete('/api/orgs/' + org.id).then(() => {
$scope.getOrgs();
});
},