External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 07:26:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix issue where pagination would lose role filter

Browse Source
This commit is contained in:
John Mitchell
2019-03-19 12:52:59 -04:00
parent f3173dbe26
commit 50079c0441
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/access/add-rbac-resource/rbac-resource.directive.js
View File

@@ -18,6 +18,7 @@ export default ['templateUrl', '$state',
resourceData: '=', resourceData: '=',
withoutTeamPermissions: '@', withoutTeamPermissions: '@',
onlyMemberRole: '@', onlyMemberRole: '@',
queryPrefix: '@',
title: '@' title: '@'
}, },
controller: controller, controller: controller,

2
awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html
View File

@@ -45,7 +45,7 @@
</div> </div>
<div id="AddPermissions-users" class="AddPermissions-list" ng-show="tab.users"> <div id="AddPermissions-users" class="AddPermissions-list" ng-show="tab.users">
<rbac-multiselect-list view="Users" all-selected="allSelected" default-params="defaultParams" dataset="usersDataset" object-type="object.type"></rbac-multiselect-list> <rbac-multiselect-list view="Users" all-selected="allSelected" default-params="defaultParams" dataset="usersDataset" object-type="object.type" query-prefix="{{ queryPrefix }}"></rbac-multiselect-list>
</div> </div>
<div id="AddPermissions-teams" class="AddPermissions-list" ng-if="tab.teams"> <div id="AddPermissions-teams" class="AddPermissions-list" ng-if="tab.teams">
<rbac-multiselect-list view="Teams" all-selected="allSelected" dataset="teamsDataset" object-type="object.type"></rbac-multiselect-list> <rbac-multiselect-list view="Teams" all-selected="allSelected" dataset="teamsDataset" object-type="object.type"></rbac-multiselect-list>

10
awx/ui/client/src/access/rbac-multiselect/rbac-multiselect-list.directive.js
View File

@@ -18,7 +18,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
view: '@', view: '@',
dataset: '=', dataset: '=',
defaultParams: '=?', defaultParams: '=?',
objectType: '=' objectType: '=',
queryPrefix: '@'
}, },
template: "<div class='addPermissionsList-inner'></div>", template: "<div class='addPermissionsList-inner'></div>",
link: function(scope, element, attrs, ctrl) { link: function(scope, element, attrs, ctrl) {
@@ -35,6 +36,9 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
Organizations: OrganizationList Organizations: OrganizationList
}; };
list = _.cloneDeep(listMap[scope.view]); list = _.cloneDeep(listMap[scope.view]);
if (scope.queryPrefix) {
list.iterator = scope.queryPrefix;
}
list.multiSelect = true; list.multiSelect = true;
list.multiSelectExtended = true; list.multiSelectExtended = true;
list.listTitleBadge = false; list.listTitleBadge = false;
@@ -93,7 +97,9 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
list.fields.name.columnClass = 'col-sm-12'; list.fields.name.columnClass = 'col-sm-12';
break; break;
case 'Users': case 'Users':
list.querySet = { order_by: 'username', page_size: '5' }; if (!scope.queryPrefix) {
list.querySet = { order_by: 'username', page_size: '5' };
}
list.fields = { list.fields = {
username: list.fields.username, username: list.fields.username,
first_name: list.fields.first_name, first_name: list.fields.first_name,

4
awx/ui/client/src/shared/stateDefinitions.factory.js
View File

@@ -581,8 +581,8 @@ function($injector, $stateExtender, $log, i18n) {
states.push($stateExtender.buildDefinition({ states.push($stateExtender.buildDefinition({
name: `${formStateDefinition.name}.users.add`, name: `${formStateDefinition.name}.users.add`,
squashSearchUrl: true,
url: '/add-user', url: '/add-user',
searchPrefix: 'add_user',
params: { params: {
add_user_search: { add_user_search: {
value: { order_by: 'username', page_size: '5' }, value: { order_by: 'username', page_size: '5' },
@@ -591,7 +591,7 @@ function($injector, $stateExtender, $log, i18n) {
}, },
views: { views: {
[`modal@${formStateDefinition.name}`]: { [`modal@${formStateDefinition.name}`]: {
template: `<add-rbac-resource default-params="$resolve.defaultParams" users-dataset="$resolve.usersDataset" selected="allSelected" resource-data="$resolve.resourceData" without-team-permissions="true" title="` + i18n._('Add Users') + `" only-member-role="true"></add-rbac-resource>` template: `<add-rbac-resource default-params="$resolve.defaultParams" users-dataset="$resolve.usersDataset" selected="allSelected" resource-data="$resolve.resourceData" without-team-permissions="true" title="` + i18n._('Add Users') + `" only-member-role="true" query-prefix="add_user"></add-rbac-resource>`
} }
}, },
ncyBreadcrumb:{ ncyBreadcrumb:{