瀏覽代碼

migrated admin files to ts (#9975)

Patrick O'Carroll 8 年之前
父節點
當前提交
3acf106303

+ 3 - 3
public/app/features/admin/admin.ts

@@ -1,7 +1,7 @@
 import  AdminListUsersCtrl from './admin_list_users_ctrl';
-import  './adminListOrgsCtrl';
-import  './adminEditOrgCtrl';
-import  './adminEditUserCtrl';
+import  './admin_list_orgs_ctrl';
+import  './admin_edit_org_ctrl';
+import  './admin_edit_user_ctrl';
 
 import coreModule from 'app/core/core_module';
 

+ 7 - 11
public/app/features/admin/adminEditOrgCtrl.js → public/app/features/admin/admin_edit_org_ctrl.ts

@@ -1,13 +1,9 @@
-define([
-  'angular',
-],
-function (angular) {
-  'use strict';
+import angular from 'angular';
 
-  var module = angular.module('grafana.controllers');
-
-  module.controller('AdminEditOrgCtrl', function($scope, $routeParams, backendSrv, $location, navModelSrv) {
+export class AdminEditOrgCtrl {
 
+  /** @ngInject */
+  constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
     $scope.init = function() {
       $scope.navModel = navModelSrv.getAdminNav();
 
@@ -48,7 +44,7 @@ function (angular) {
     };
 
     $scope.init();
+  }
+}
 
-  });
-
-});
+angular.module('grafana.controllers').controller('AdminEditOrgCtrl', AdminEditOrgCtrl);

+ 8 - 10
public/app/features/admin/adminEditUserCtrl.js → public/app/features/admin/admin_edit_user_ctrl.ts

@@ -1,13 +1,10 @@
-define([
-  'angular',
-  'lodash',
-],
-function (angular, _) {
-  'use strict';
+import angular from 'angular';
+import _ from 'lodash';
 
-  var module = angular.module('grafana.controllers');
+export class AdminEditUserCtrl {
 
-  module.controller('AdminEditUserCtrl', function($scope, $routeParams, backendSrv, $location, navModelSrv) {
+  /** @ngInject */
+  constructor($scope, $routeParams, backendSrv, $location, navModelSrv) {
     $scope.user = {};
     $scope.newOrg = { name: '', role: 'Editor' };
     $scope.permissions = {};
@@ -106,6 +103,7 @@ function (angular, _) {
     };
 
     $scope.init();
+  }
+}
 
-  });
-});
+angular.module('grafana.controllers').controller('AdminEditUserCtrl', AdminEditUserCtrl);

+ 7 - 11
public/app/features/admin/adminListOrgsCtrl.js → public/app/features/admin/admin_list_orgs_ctrl.ts

@@ -1,13 +1,9 @@
-define([
-  'angular',
-],
-function (angular) {
-  'use strict';
+import angular from 'angular';
 
-  var module = angular.module('grafana.controllers');
-
-  module.controller('AdminListOrgsCtrl', function($scope, backendSrv, navModelSrv) {
+export class AdminListOrgsCtrl {
 
+  /** @ngInject */
+  constructor($scope, backendSrv, navModelSrv) {
     $scope.init = function() {
       $scope.navModel = navModelSrv.getAdminNav();
       $scope.getOrgs();
@@ -35,7 +31,7 @@ function (angular) {
     };
 
     $scope.init();
+  }
+}
 
-  });
-
-});
+angular.module('grafana.controllers').controller('AdminListOrgsCtrl', AdminListOrgsCtrl);