You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2018/05/17 02:26:01 UTC
[incubator-trafficcontrol] 15/17: toggles capability views on/off
by use of a parameter
This is an automated email from the ASF dual-hosted git repository.
mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit f64613d60663fd3a9755584a4ca3b31dc95bd47a
Author: Jeremy Mitchell <mi...@gmail.com>
AuthorDate: Wed May 9 20:50:23 2018 -0600
toggles capability views on/off by use of a parameter
---
.../app/src/common/modules/form/capability/form.capability.tpl.html | 2 +-
.../app/src/common/modules/form/role/edit/FormEditRoleController.js | 6 ++++--
traffic_portal/app/src/common/modules/form/role/form.role.tpl.html | 4 ++--
traffic_portal/app/src/common/modules/form/user/form.user.tpl.html | 1 +
.../app/src/common/modules/navigation/navigation.tpl.html | 2 --
traffic_portal/app/src/modules/private/roles/edit/index.js | 3 +++
6 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/traffic_portal/app/src/common/modules/form/capability/form.capability.tpl.html b/traffic_portal/app/src/common/modules/form/capability/form.capability.tpl.html
index 6173a20..07a716a 100644
--- a/traffic_portal/app/src/common/modules/form/capability/form.capability.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/capability/form.capability.tpl.html
@@ -25,7 +25,7 @@ under the License.
</ol>
<div class="pull-right" role="group" ng-show="!settings.isNew">
<button class="btn btn-primary" title="View Endpoints" ng-click="viewEndpoints()">View Endpoints</button>
- <button class="btn btn-primary" title="View Users" ng-click="viewUsers()">View Users</button>
+ <!--<button class="btn btn-primary" title="View Users" ng-click="viewUsers()">View Users</button>-->
</div>
<div class="clearfix"></div>
</div>
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
index 34df89f..cbcc572 100644
--- 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, $scope, $controller, $uibModal, $anchorScroll, $location, locationUtils, roleService, messageModel) {
+var FormEditRoleController = function(roles, useCapabilities, $scope, $controller, $uibModal, $anchorScroll, $location, locationUtils, roleService, messageModel) {
// extends the FormRoleController to inherit common methods
angular.extend(this, $controller('FormRoleController', { roles: roles, $scope: $scope }));
@@ -39,6 +39,8 @@ var FormEditRoleController = function(roles, $scope, $controller, $uibModal, $an
});
};
+ $scope.useCapabilities = (useCapabilities[0]) ? useCapabilities[0].value : 0;
+
$scope.roleName = angular.copy($scope.role.name);
$scope.settings = {
@@ -101,5 +103,5 @@ var FormEditRoleController = function(roles, $scope, $controller, $uibModal, $an
};
-FormEditRoleController.$inject = ['roles', '$scope', '$controller', '$uibModal', '$anchorScroll', '$location', 'locationUtils', 'roleService', 'messageModel'];
+FormEditRoleController.$inject = ['roles', 'useCapabilities', '$scope', '$controller', '$uibModal', '$anchorScroll', '$location', 'locationUtils', 'roleService', 'messageModel'];
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
index 0dfece9..bc425be 100644
--- 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,8 +24,8 @@ under the License.
<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-click="viewCapabilities()">View Capabilities</button>
- <button class="btn btn-primary" title="View Users" ng-click="viewUsers()">View Users</button>
+ <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 Users" ng-click="viewUsers()">View Users</button>-->
</div>
<div class="clearfix"></div>
</div>
diff --git a/traffic_portal/app/src/common/modules/form/user/form.user.tpl.html b/traffic_portal/app/src/common/modules/form/user/form.user.tpl.html
index 2a6031e..875e2a8 100644
--- a/traffic_portal/app/src/common/modules/form/user/form.user.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/user/form.user.tpl.html
@@ -68,6 +68,7 @@ under the License.
<option value="">Select...</option>
</select>
<small class="input-error" ng-show="hasPropertyError(userForm.role, 'required')">Required</small>
+ <small ng-show="user.role"><a href="/#!/roles/{{user.role}}" target="_blank">View Details <i class="fa fs-xs fa-external-link"></i></a></small>
</div>
</div>
<div class="form-group" ng-class="{'has-error': hasError(userForm.tenantId), 'has-feedback': hasError(userForm.tenantId)}">
diff --git a/traffic_portal/app/src/common/modules/navigation/navigation.tpl.html b/traffic_portal/app/src/common/modules/navigation/navigation.tpl.html
index 308d1e3..d57ef47 100644
--- a/traffic_portal/app/src/common/modules/navigation/navigation.tpl.html
+++ b/traffic_portal/app/src/common/modules/navigation/navigation.tpl.html
@@ -65,11 +65,9 @@ under the License.
</li>
<li class="side-menu-category"><a href="javascript:void(0);"><i class="fa fa-sm fa-chevron-right"></i> User Admin</span></a>
<ul class="nav child_menu" style="display: none">
- <!--<li class="side-menu-category-item" ng-class="{'current-page': isState('trafficPortal.private.capabilities')}"><a href="/#!/capabilities">Capabilities</a></li>-->
<li class="side-menu-category-item" ng-class="{'current-page': isState('trafficPortal.private.users')}"><a href="/#!/users">Users</a></li>
<li class="side-menu-category-item" ng-class="{'current-page': isState('trafficPortal.private.tenants')}"><a href="/#!/tenants">Tenants</a></li>
<li class="side-menu-category-item" ng-class="{'current-page': isState('trafficPortal.private.roles')}"><a href="/#!/roles">Roles</a></li>
- <li class="side-menu-category-item" ng-class="{'current-page': isState('trafficPortal.private.capabilities')}"><a href="/#!/capabilities">Capabilities</a></li>
</ul>
</li>
<li class="side-menu-category" ng-if="customMenu.items.length > 0"><a href="javascript:void(0);"><i class="fa fa-sm fa-chevron-right"></i> {{::customMenu.name}}</span></a>
diff --git a/traffic_portal/app/src/modules/private/roles/edit/index.js b/traffic_portal/app/src/modules/private/roles/edit/index.js
index df12cc6..64eeb38 100644
--- a/traffic_portal/app/src/modules/private/roles/edit/index.js
+++ b/traffic_portal/app/src/modules/private/roles/edit/index.js
@@ -29,6 +29,9 @@ 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' });
}
}
}
--
To stop receiving notification emails like this one, please contact
mitchell852@apache.org.