mirror of
https://github.com/ansible/awx.git
synced 2026-03-02 17:28:51 -03:30
Fixed additional pagingation issues. Should be good now.
This commit is contained in:
@@ -53,10 +53,12 @@ angular.module('PaginateHelper', ['RefreshHelper'])
|
|||||||
scope.changePageSize = function(set, iterator) {
|
scope.changePageSize = function(set, iterator) {
|
||||||
// Called when a new page size is selected
|
// Called when a new page size is selected
|
||||||
scope[iterator + 'Page'] = 0;
|
scope[iterator + 'Page'] = 0;
|
||||||
url = url.replace(/\/\?.*$/,'/').replace(/\/\&.*$/,'/');
|
//url = url.replace(/\/\?.*$/,'/').replace(/\/\&.*$/,'/');
|
||||||
url += (scope[iterator + 'SearchParams']) ? '?' + scope[iterator + 'SearchParams'] + '&page_size=' + scope[iterator + 'PageSize' ] :
|
var new_url = url.replace(/\?page_size\=\d+/,'');
|
||||||
'?page_size=' + scope[iterator + 'PageSize' ];
|
var connect = (/\/$/.test(new_url)) ? '?' : '&';
|
||||||
Refresh({ scope: scope, set: set, iterator: iterator, url: url });
|
new_url += (scope[iterator + 'SearchParams']) ? connect + scope[iterator + 'SearchParams'] + '&page_size=' + scope[iterator + 'PageSize' ] :
|
||||||
|
+ connect + 'page_size=' + scope[iterator + 'PageSize' ];
|
||||||
|
Refresh({ scope: scope, set: set, iterator: iterator, url: new_url });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}]);
|
}]);
|
||||||
Reference in New Issue
Block a user