You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by dy...@apache.org on 2018/08/09 16:06:43 UTC
[trafficcontrol] 02/03: creates a permission utils for methods
related to checking roles/capabilities
This is an automated email from the ASF dual-hosted git repository.
dylan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit aa672d00ff58e512301d992cecc4219aa078f10d
Author: Jeremy Mitchell <mi...@gmail.com>
AuthorDate: Tue Aug 7 19:08:57 2018 -0600
creates a permission utils for methods related to checking roles/capabilities
---
.../src/common/modules/header/HeaderController.js | 8 +++-----
.../modules/navigation/NavigationController.js | 8 +++-----
.../service/utils/{index.js => PermissionUtils.js} | 24 +++++++++++-----------
.../app/src/common/service/utils/index.js | 1 +
4 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/traffic_portal/app/src/common/modules/header/HeaderController.js b/traffic_portal/app/src/common/modules/header/HeaderController.js
index 3f8da48..da283ff 100644
--- a/traffic_portal/app/src/common/modules/header/HeaderController.js
+++ b/traffic_portal/app/src/common/modules/header/HeaderController.js
@@ -17,7 +17,7 @@
* under the License.
*/
-var HeaderController = function($rootScope, $scope, $state, $uibModal, $location, $anchorScroll, locationUtils, authService, trafficPortalService, changeLogService, cdnService, changeLogModel, userModel) {
+var HeaderController = function($rootScope, $scope, $state, $uibModal, $location, $anchorScroll, locationUtils, permissionUtils, authService, trafficPortalService, changeLogService, cdnService, changeLogModel, userModel) {
$scope.isCollapsed = true;
@@ -32,9 +32,7 @@ var HeaderController = function($rootScope, $scope, $state, $uibModal, $location
$scope.changeLogs = [];
- $scope.hasCapability = function(cap) {
- return userModel.hasCapability(cap);
- };
+ $scope.hasCapability = permissionUtils.hasCapability;
$scope.isState = function(state) {
return $state.current.name.indexOf(state) !== -1;
@@ -164,5 +162,5 @@ var HeaderController = function($rootScope, $scope, $state, $uibModal, $location
init();
};
-HeaderController.$inject = ['$rootScope', '$scope', '$state', '$uibModal', '$location', '$anchorScroll', 'locationUtils', 'authService', 'trafficPortalService', 'changeLogService', 'cdnService', 'changeLogModel', 'userModel'];
+HeaderController.$inject = ['$rootScope', '$scope', '$state', '$uibModal', '$location', '$anchorScroll', 'locationUtils', 'permissionUtils', 'authService', 'trafficPortalService', 'changeLogService', 'cdnService', 'changeLogModel', 'userModel'];
module.exports = HeaderController;
diff --git a/traffic_portal/app/src/common/modules/navigation/NavigationController.js b/traffic_portal/app/src/common/modules/navigation/NavigationController.js
index 1f990b6..e202733 100644
--- a/traffic_portal/app/src/common/modules/navigation/NavigationController.js
+++ b/traffic_portal/app/src/common/modules/navigation/NavigationController.js
@@ -17,7 +17,7 @@
* under the License.
*/
-var NavigationController = function($scope, $log, $state, $location, $window, $timeout, $uibModal, authService, trafficPortalService, propertiesModel, userModel) {
+var NavigationController = function($scope, $log, $state, $location, $window, $timeout, $uibModal, permissionUtils, authService, trafficPortalService, propertiesModel, userModel) {
$scope.appName = propertiesModel.properties.name;
@@ -41,9 +41,7 @@ var NavigationController = function($scope, $log, $state, $location, $window, $t
isDisabled: false
};
- $scope.hasCapability = function(cap) {
- return userModel.hasCapability(cap);
- };
+ $scope.hasCapability = permissionUtils.hasCapability;
$scope.navigateToPath = function(path) {
$location.url(path);
@@ -165,5 +163,5 @@ var NavigationController = function($scope, $log, $state, $location, $window, $t
};
-NavigationController.$inject = ['$scope', '$log', '$state', '$location', '$window', '$timeout', '$uibModal', 'authService', 'trafficPortalService', 'propertiesModel', 'userModel'];
+NavigationController.$inject = ['$scope', '$log', '$state', '$location', '$window', '$timeout', '$uibModal', 'permissionUtils', 'authService', 'trafficPortalService', 'propertiesModel', 'userModel'];
module.exports = NavigationController;
diff --git a/traffic_portal/app/src/common/service/utils/index.js b/traffic_portal/app/src/common/service/utils/PermissionUtils.js
similarity index 58%
copy from traffic_portal/app/src/common/service/utils/index.js
copy to traffic_portal/app/src/common/service/utils/PermissionUtils.js
index 131551c..268e70b 100644
--- a/traffic_portal/app/src/common/service/utils/index.js
+++ b/traffic_portal/app/src/common/service/utils/PermissionUtils.js
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,13 +17,13 @@
* under the License.
*/
-module.exports = angular.module('trafficPortal.utils', [])
- .service('dateUtils', require('./DateUtils'))
- .service('deliveryServiceUtils', require('./DeliveryServiceUtils'))
- .service('fileUtils', require('./FileUtils'))
- .service('formUtils', require('./FormUtils'))
- .service('locationUtils', require('./LocationUtils'))
- .service('numberUtils', require('./NumberUtils'))
- .service('serverUtils', require('./ServerUtils'))
- .service('stringUtils', require('./StringUtils'))
- .service('tenantUtils', require('./TenantUtils'));
+var PermissionUtils = function(userModel) {
+
+ this.hasCapability = function(cap) {
+ return userModel.hasCapability(cap);
+ };
+
+};
+
+PermissionUtils.$inject = ['userModel'];
+module.exports = PermissionUtils;
diff --git a/traffic_portal/app/src/common/service/utils/index.js b/traffic_portal/app/src/common/service/utils/index.js
index 131551c..936a7dd 100644
--- a/traffic_portal/app/src/common/service/utils/index.js
+++ b/traffic_portal/app/src/common/service/utils/index.js
@@ -24,6 +24,7 @@ module.exports = angular.module('trafficPortal.utils', [])
.service('formUtils', require('./FormUtils'))
.service('locationUtils', require('./LocationUtils'))
.service('numberUtils', require('./NumberUtils'))
+ .service('permissionUtils', require('./PermissionUtils'))
.service('serverUtils', require('./ServerUtils'))
.service('stringUtils', require('./StringUtils'))
.service('tenantUtils', require('./TenantUtils'));