This is an automated email from the ASF dual-hosted git repository.
rawlin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 61b9d9f Fix TP roles navigation (#6253)
61b9d9f is described below
commit 61b9d9fcdf1775f88e82f51928bde05d720ee927
Author: Srijeet Chatterjee <[email protected]>
AuthorDate: Tue Oct 5 15:51:21 2021 -0600
Fix TP roles navigation (#6253)
* Fix TP roles navigation
* fix a couple other issues, and commit uncommitted files
---
.../form/deliveryService/edit/FormEditDeliveryServiceController.js | 4 ++--
.../form/deliveryService/new/FormNewDeliveryServiceController.js | 2 +-
traffic_portal/app/src/common/modules/form/user/form.user.tpl.html | 2 +-
.../modules/table/deliveryServices/TableDeliveryServicesController.js | 2 +-
.../app/src/common/modules/table/roleUsers/table.roleUsers.tpl.html | 4 ++--
.../src/common/modules/table/tenantUsers/table.tenantUsers.tpl.html | 2 +-
traffic_portal/app/src/modules/private/roles/users/index.js | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
b/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
index 1aac4c1..7e278d8 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/edit/FormEditDeliveryServiceController.js
@@ -45,7 +45,7 @@ var FormEditDeliveryServiceController =
function(deliveryService, origin, topolo
{ id: $scope.DRAFT, name: 'Save
Request as Draft' },
{ id: $scope.SUBMITTED, name:
'Submit Request for Review and Deployment' }
];
- if (userModel.user.roleName ==
propertiesModel.properties.dsRequests.overrideRole) {
+ if (userModel.user.role ==
propertiesModel.properties.dsRequests.overrideRole) {
statuses.push({ id:
$scope.COMPLETE, name: 'Fulfill Request Immediately' });
}
return statuses;
@@ -218,7 +218,7 @@ var FormEditDeliveryServiceController =
function(deliveryService, origin, topolo
{ id: $scope.DRAFT,
name: 'Save Request as Draft' },
{ id: $scope.SUBMITTED,
name: 'Submit Request for Review and Deployment' }
];
- if (userModel.user.roleName ==
propertiesModel.properties.dsRequests.overrideRole) {
+ if (userModel.user.role ==
propertiesModel.properties.dsRequests.overrideRole) {
statuses.push({ id:
$scope.COMPLETE, name: 'Fulfill Request Immediately' });
}
return statuses;
diff --git
a/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
b/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
index e33cb82..1f9e808 100644
---
a/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
+++
b/traffic_portal/app/src/common/modules/form/deliveryService/new/FormNewDeliveryServiceController.js
@@ -88,7 +88,7 @@ var FormNewDeliveryServiceController =
function(deliveryService, origin, topolog
{ id: $scope.DRAFT,
name: 'Save Request as Draft' },
{ id: $scope.SUBMITTED,
name: 'Submit Request for Review and Deployment' }
];
- if (userModel.user.roleName ==
propertiesModel.properties.dsRequests.overrideRole) {
+ if (userModel.user.role ==
propertiesModel.properties.dsRequests.overrideRole) {
statuses.push({ id:
$scope.COMPLETE, name: 'Fulfill Request Immediately' });
}
return statuses;
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 29cd054..dd98f71 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
@@ -69,7 +69,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>
+ <small ng-show="user.role"><a
href="/#!/roles/edit/{{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/table/deliveryServices/TableDeliveryServicesController.js
b/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
index f19b953..7af7019 100644
---
a/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
+++
b/traffic_portal/app/src/common/modules/table/deliveryServices/TableDeliveryServicesController.js
@@ -483,7 +483,7 @@ var TableDeliveryServicesController = function(tableName,
deliveryServices, filt
{ id: $scope.DRAFT, name: 'Save Request as Draft' },
{ id: $scope.SUBMITTED, name: 'Submit Request for
Review and Deployment' }
];
- if (userModel.user.roleName ==
propertiesModel.properties.dsRequests.overrideRole) {
+ if (userModel.user.role ==
propertiesModel.properties.dsRequests.overrideRole) {
statuses.push({ id: $scope.COMPLETE, name: 'Fulfill
Request Immediately' });
}
return statuses;
diff --git
a/traffic_portal/app/src/common/modules/table/roleUsers/table.roleUsers.tpl.html
b/traffic_portal/app/src/common/modules/table/roleUsers/table.roleUsers.tpl.html
index d64331f..fb8813f 100644
---
a/traffic_portal/app/src/common/modules/table/roleUsers/table.roleUsers.tpl.html
+++
b/traffic_portal/app/src/common/modules/table/roleUsers/table.roleUsers.tpl.html
@@ -21,7 +21,7 @@ under the License.
<div class="x_title">
<ol class="breadcrumb pull-left">
<li><a ng-click="navigateToPath('/roles')">Roles</a></li>
- <li><a ng-click="navigateToPath('/roles/' +
role.name)">{{::role.name}}</a></li>
+ <li><a ng-click="navigateToPath('/roles/edit/' +
role.name)">{{::role.name}}</a></li>
<li class="active">Users</li>
</ol>
<div class="pull-right">
@@ -63,7 +63,7 @@ under the License.
<td data-search="^{{::u.username}}$">{{::u.username}}</td>
<td data-search="^{{::u.email}}$">{{::u.email}}</td>
<td data-search="^{{::u.tenant}}$">{{::u.tenant}}</td>
- <td data-search="^{{::u.rolename}}$">{{::u.rolename}}</td>
+ <td data-search="^{{::u.role}}$">{{::u.role}}</td>
<td
data-search="^{{::u.registrationSent}}$">{{::u.registrationSent}}</td>
<td
data-search="^{{::relativeLoginTime(u.lastAuthenticated)}}$">{{::relativeLoginTime(u.lastAuthenticated)}}</td>
<td
data-search="^{{::u.changeLogCount}}$">{{::u.changeLogCount}}</td>
diff --git
a/traffic_portal/app/src/common/modules/table/tenantUsers/table.tenantUsers.tpl.html
b/traffic_portal/app/src/common/modules/table/tenantUsers/table.tenantUsers.tpl.html
index 168cfc5..5646285 100644
---
a/traffic_portal/app/src/common/modules/table/tenantUsers/table.tenantUsers.tpl.html
+++
b/traffic_portal/app/src/common/modules/table/tenantUsers/table.tenantUsers.tpl.html
@@ -63,7 +63,7 @@ under the License.
<td data-search="^{{::u.username}}$">{{::u.username}}</td>
<td data-search="^{{::u.email}}$">{{::u.email}}</td>
<td data-search="^{{::u.tenant}}$">{{::u.tenant}}</td>
- <td data-search="^{{::u.rolename}}$">{{::u.rolename}}</td>
+ <td data-search="^{{::u.role}}$">{{::u.role}}</td>
<td
data-search="^{{::u.registrationSent}}$">{{::u.registrationSent}}</td>
<td
data-search="^{{::relativeLoginTime(u.lastAuthenticated)}}$">{{::relativeLoginTime(u.lastAuthenticated)}}</td>
<td
data-search="^{{::u.changeLogCount}}$">{{::u.changeLogCount}}</td>
diff --git a/traffic_portal/app/src/modules/private/roles/users/index.js
b/traffic_portal/app/src/modules/private/roles/users/index.js
index 299a98a..5d415e5 100644
--- a/traffic_portal/app/src/modules/private/roles/users/index.js
+++ b/traffic_portal/app/src/modules/private/roles/users/index.js
@@ -21,7 +21,7 @@ module.exports =
angular.module('trafficPortal.private.roles.users', [])
.config(function($stateProvider, $urlRouterProvider) {
$stateProvider
.state('trafficPortal.private.roles.users', {
- url: '/{roleName}/users',
+ url: '/edit/{roleName}/users',
views: {
rolesContent: {
templateUrl:
'common/modules/table/roleUsers/table.roleUsers.tpl.html',
