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

Merge pull request #2109 from marshmalien/fix/2068-pagination-error

Browse Source 
Add value to $scope.querySet when in .users.add states
This commit is contained in:
Marliana Lara
2018-06-08 16:19:36 -04:00
committed by GitHub
parent 8b543ea0a7 750f70c21f
commit 3ff3e8d298
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,6 +88,7 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
break;
case 'Users':
list.querySet = { order_by: 'username', page_size: '5' };
list.fields = {
username: list.fields.username,
first_name: list.fields.first_name,
@@ -161,10 +162,11 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
function optionsRequestDataProcessing(){
if(scope.list.name === 'users'){
if (scope[list.name] !== undefined) {
scope[`${list.iterator}_queryset`] = list.querySet;
scope[list.name].forEach(function(item, item_idx) {
var itm = scope[list.name][item_idx];
if(itm.summary_fields.user_capabilities.edit){
// undefined doesn't render the tooltip,
// undefined doesn't render the tooltip,
// which is intended here.
itm.tooltip = undefined;
}