turn caps on/off based upon setting in tp_properties.json

apache · Aug 17, 2018 · 1c24ccf · 1c24ccf
1 parent 4a25e16
commit 1c24ccf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/traffic_portal/app/src/common/modules/form/role/edit/FormEditRoleController.js b/traffic_portal/app/src/common/modules/form/role/edit/FormEditRoleController.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-var FormEditRoleController = function(roles, useCapabilities, $scope, $controller, $uibModal, $anchorScroll, $location, locationUtils, roleService, messageModel) {
+var FormEditRoleController = function(roles, $scope, $controller, $uibModal, $anchorScroll, $location, locationUtils, roleService, messageModel, propertiesModel) {
 
 	// extends the FormRoleController to inherit common methods
 	angular.extend(this, $controller('FormRoleController', { roles: roles, $scope: $scope }));
@@ -39,7 +39,7 @@ var FormEditRoleController = function(roles, useCapabilities, $scope, $controlle
 			});
 	};
 
-	$scope.useCapabilities = (useCapabilities[0]) ? useCapabilities[0].value : 0;
+	$scope.enforceCapabilities = propertiesModel.properties.enforceCapabilities;
 
 	$scope.roleName = angular.copy($scope.role.name);
 
@@ -103,5 +103,5 @@ var FormEditRoleController = function(roles, useCapabilities, $scope, $controlle
 
 };
 
-FormEditRoleController.$inject = ['roles', 'useCapabilities', '$scope', '$controller', '$uibModal', '$anchorScroll', '$location', 'locationUtils', 'roleService', 'messageModel'];
+FormEditRoleController.$inject = ['roles', '$scope', '$controller', '$uibModal', '$anchorScroll', '$location', 'locationUtils', 'roleService', 'messageModel', 'propertiesModel'];
 module.exports = FormEditRoleController;
diff --git a/traffic_portal/app/src/common/modules/form/role/form.role.tpl.html b/traffic_portal/app/src/common/modules/form/role/form.role.tpl.html
@@ -24,7 +24,7 @@
             <li class="active">{{roleName}}</li>
         </ol>
         <div class="pull-right" role="group" ng-show="!settings.isNew">
-            <button class="btn btn-primary" title="View Capabilities" ng-if="useCapabilities == '1'" ng-click="viewCapabilities()">View Capabilities</button>
+            <button class="btn btn-primary" title="View Capabilities" ng-show="enforceCapabilities" ng-click="viewCapabilities()">View Capabilities</button>
             <!--<button class="btn btn-primary" title="View Users" ng-click="viewUsers()">View Users</button>-->
         </div>
         <div class="clearfix"></div>

diff --git a/traffic_portal/app/src/modules/private/roles/edit/index.js b/traffic_portal/app/src/modules/private/roles/edit/index.js
@@ -29,9 +29,6 @@ module.exports = angular.module('trafficPortal.private.roles.edit', [])
 						resolve: {
 							roles: function($stateParams, roleService) {
 								return roleService.getRoles({ id: $stateParams.roleId });
-							},
-							useCapabilities: function(parameterService) {
-								return parameterService.getParameters({ name: 'use_capabilities', configFile: 'global' });
 							}
 						}
 					}