diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js index 974e0e885e..892c5f66b6 100644 --- a/awx/ui/client/src/app.js +++ b/awx/ui/client/src/app.js @@ -887,9 +887,9 @@ var tower = angular.module('Tower', [ }]) .run(['$q', '$compile', '$cookieStore', '$rootScope', '$log', 'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer', 'ClearScope', 'Socket', - 'LoadConfig', 'Store', 'ShowSocketHelp', 'AboutAnsibleHelp', 'pendoService', 'Prompt', 'Rest', 'Wait', 'ProcessErrors', '$state', + 'LoadConfig', 'Store', 'ShowSocketHelp', 'AboutAnsibleHelp', 'pendoService', 'Prompt', 'Rest', 'Wait', 'ProcessErrors', '$state', 'GetBasePath', function ($q, $compile, $cookieStore, $rootScope, $log, CheckLicense, $location, Authorization, LoadBasePaths, Timer, ClearScope, Socket, - LoadConfig, Store, ShowSocketHelp, AboutAnsibleHelp, pendoService, Prompt, Rest, Wait, ProcessErrors, $state) { + LoadConfig, Store, ShowSocketHelp, AboutAnsibleHelp, pendoService, Prompt, Rest, Wait, ProcessErrors, $state, GetBasePath) { var sock; $rootScope.deletePermission = function (user, role, userName, @@ -897,7 +897,7 @@ var tower = angular.module('Tower', [ var action = function () { $('#prompt-modal').modal('hide'); Wait('start'); - var url = "/api/v1/users/" + user + "/roles/"; + var url = GetBasePath("users") + user + "/roles/"; Rest.setUrl(url); Rest.post({"disassociate": true, "id": role}) .success(function () { @@ -906,7 +906,7 @@ var tower = angular.module('Tower', [ }) .error(function (data, status) { ProcessErrors($rootScope, data, status, null, { hdr: 'Error!', - msg: 'Call to ' + url + ' failed. DELETE returned status: ' + status }); + msg: 'Could not disacssociate user from role. Call to ' + url + ' failed. DELETE returned status: ' + status }); }); }; diff --git a/awx/ui/client/src/helpers/PaginationHelpers.js b/awx/ui/client/src/helpers/PaginationHelpers.js index 4bbc46cd03..2b131c2dc0 100644 --- a/awx/ui/client/src/helpers/PaginationHelpers.js +++ b/awx/ui/client/src/helpers/PaginationHelpers.js @@ -134,7 +134,7 @@ export default } else if (mode === 'lookup') { scope[iterator + '_page_size'] = 5; } else { - scope[iterator + '_page_size'] = 2; + scope[iterator + '_page_size'] = 20; } scope.getPage = function (page, set, iterator) {