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

Merge pull request #2125 from Haokun-Chen/1837

Browse Source 
fix error when deleting the only item on page 2 for list page
This commit is contained in:
Haokun Chen 2018-06-12 13:50:10 -04:00 committed by GitHub
commit 387682cee8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/features/jobs/jobsList.controller.js
View File

@ -102,12 +102,11 @@ function ListJobsController (
let reloadListStateParams = null;
if ($scope.jobs.length === 1 && $state.params.job_search &&
!_.isEmpty($state.params.job_search.page) &&
_.has($state, 'params.job_search.page') &&
$state.params.job_search.page !== '1') {
const page = `${(parseInt(reloadListStateParams
.job_search.page, 10) - 1)}`;
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.job_search.page = page;
reloadListStateParams.job_search.page =
(parseInt(reloadListStateParams.job_search.page, 10) - 1).toString();
}
$state.go('.', reloadListStateParams, { reload: true });

4
awx/ui/client/features/templates/templatesList.controller.js
View File

@ -164,7 +164,7 @@ function ListTemplatesController(
return html;
};
vm.buildCredentialTags = (credentials) => {
return credentials.map(credential => {
const icon = `${credential.kind}`;
@ -265,7 +265,7 @@ function ListTemplatesController(
const { page } = _.get($state.params, 'template_search');
let reloadListStateParams = null;
if ($scope.templates.length === 1 && !_.isEmpty(page) && page !== '1') {
if ($scope.templates.length === 1 && page && page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
const pageNumber = (parseInt(reloadListStateParams.template_search.page, 0) - 1);
reloadListStateParams.template_search.page = pageNumber.toString();

2
awx/ui/client/src/credential-types/list/list.controller.js
View File

@ -68,7 +68,7 @@ export default ['$rootScope', '$scope', 'Wait', 'CredentialTypesList',
let reloadListStateParams = null;
if($scope.credential_types.length === 1 && $state.params.credential_type_search && !_.isEmpty($state.params.credential_type_search.page) && $state.params.credential_type_search.page !== '1') {
if($scope.credential_types.length === 1 && $state.params.credential_type_search && _.has($state, 'params.credential_type_search.page') && $state.params.credential_type_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.credential_type_search.page = (parseInt(reloadListStateParams.credential_type_search.page)-1).toString();
}

2
awx/ui/client/src/credentials/list/credentials-list.controller.js
View File

@ -122,7 +122,7 @@ export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ProcessErrors', '
let reloadListStateParams = null;
if($scope.credentials.length === 1 && $state.params.credential_search && !_.isEmpty($state.params.credential_search.page) && $state.params.credential_search.page !== '1') {
if($scope.credentials.length === 1 && $state.params.credential_search && _.has($state, 'params.credential_search.page') && $state.params.credential_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.credential_search.page = (parseInt(reloadListStateParams.credential_search.page)-1).toString();
}

11
awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js
View File

@ -66,10 +66,17 @@ export default ['$scope', '$filter', '$state', 'Alert', 'resolvedModels', 'Datas
};
function handleSuccessfulDelete(instance_group) {
let reloadListStateParams = null;
if($scope.instance_groups.length === 1 && $state.params.instance_group_search && _.has($state, 'params.instance_group_search.page') && $state.params.instance_group_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.instance_group_search.page = (parseInt(reloadListStateParams.instance_group_search.page)-1).toString();
}
if (parseInt($state.params.instance_group_id, 0) === instance_group.id) {
$state.go('instanceGroups', $state.params, { reload: true });
$state.go('instanceGroups', reloadListStateParams, { reload: true });
} else {
$state.go('.', $state.params, { reload: true });
$state.go('.', reloadListStateParams, { reload: true });
}
}

2
awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js
View File

@ -153,7 +153,7 @@ function InventoriesList($scope,
if (data.status === 'deleted') {
let reloadListStateParams = null;
if($scope.inventories.length === 1 && $state.params.inventory_search && !_.isEmpty($state.params.inventory_search.page) && $state.params.inventory_search.page !== '1') {
if($scope.inventories.length === 1 && $state.params.inventory_search && _.has($state, 'params.inventory_search.page') && $state.params.inventory_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.inventory_search.page = (parseInt(reloadListStateParams.inventory_search.page)-1).toString();
}

2
awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.controller.js
View File

@ -127,7 +127,7 @@
$scope.confirmDelete = function(){
let reloadListStateParams = null;
if($scope.groups.length === 1 && $state.params.group_search && !_.isEmpty($state.params.group_search.page) && $state.params.group_search.page !== '1') {
if($scope.groups.length === 1 && $state.params.group_search && _.has($state, 'params.group_search.page') && $state.params.group_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.group_search.page = (parseInt(reloadListStateParams.group_search.page)-1).toString();
}

2
awx/ui/client/src/inventories-hosts/inventories/related/hosts/list/host-list.controller.js
View File

@ -112,7 +112,7 @@ export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath',
let reloadListStateParams = null;
if($scope.hosts.length === 1 && $state.params.host_search && !_.isEmpty($state.params.host_search.page) && $state.params.host_search.page !== '1') {
if($scope.hosts.length === 1 && $state.params.host_search && _.has($state, 'params.host_search.page') && $state.params.host_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.host_search.page = (parseInt(reloadListStateParams.host_search.page)-1).toString();
}

2
awx/ui/client/src/inventory-scripts/list/list.controller.js
View File

@ -73,7 +73,7 @@ export default ['$rootScope', '$scope', 'Wait', 'InventoryScriptsList',
let reloadListStateParams = null;
if($scope.inventory_scripts.length === 1 && $state.params.inventory_script_search && !_.isEmpty($state.params.inventory_script_search.page) && $state.params.inventory_script_search.page !== '1') {
if($scope.inventory_scripts.length === 1 && $state.params.inventory_script_search && _.has($state, 'params.inventory_script_search.page') && $state.params.inventory_script_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.inventory_script_search.page = (parseInt(reloadListStateParams.inventory_script_search.page)-1).toString();
}

2
awx/ui/client/src/notifications/notification-templates-list/list.controller.js
View File

@ -193,7 +193,7 @@
let reloadListStateParams = null;
if($scope.notification_templates.length === 1 && $state.params.notification_template_search && !_.isEmpty($state.params.notification_template_search.page) && $state.params.notification_template_search.page !== '1') {
if($scope.notification_templates.length === 1 && $state.params.notification_template_search && _.has($state, 'params.notification_template_search.page') && $state.params.notification_template_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.notification_template_search.page = (parseInt(reloadListStateParams.notification_template_search.page)-1).toString();
}

2
awx/ui/client/src/organizations/list/organizations-list.controller.js
View File

@ -149,7 +149,7 @@ export default ['$stateParams', '$scope', '$rootScope',
let reloadListStateParams = null;
if($scope.organizations.length === 1 && $state.params.organization_search && !_.isEmpty($state.params.organization_search.page) && $state.params.organization_search.page !== '1') {
if($scope.organizations.length === 1 && $state.params.organization_search && _.has($state, 'params.organization_search.page') && parseInt($state.params.organization_search.page).toString() !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.organization_search.page = (parseInt(reloadListStateParams.organization_search.page)-1).toString();
}

2
awx/ui/client/src/projects/list/projects-list.controller.js
View File

@ -198,7 +198,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
let reloadListStateParams = null;
if($scope.projects.length === 1 && $state.params.project_search && !_.isEmpty($state.params.project_search.page) && $state.params.project_search.page !== '1') {
if($scope.projects.length === 1 && $state.params.project_search && _.has($state, 'params.project_search.page') && $state.params.project_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.project_search.page = (parseInt(reloadListStateParams.project_search.page)-1).toString();
}

2
awx/ui/client/src/scheduler/factories/delete-schedule.factory.js
View File

@ -28,7 +28,7 @@ export default
let reloadListStateParams = null;
if(scope.schedules.length === 1 && $state.params.schedule_search && !_.isEmpty($state.params.schedule_search.page) && $state.params.schedule_search.page !== '1') {
if(scope.schedules.length === 1 && $state.params.schedule_search && _.has($state, 'params.schedule_search.page') && $state.params.schedule_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.schedule_search.page = (parseInt(reloadListStateParams.schedule_search.page)-1).toString();
}

2
awx/ui/client/src/teams/list/teams-list.controller.js
View File

@ -53,7 +53,7 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt',
let reloadListStateParams = null;
if($scope.teams.length === 1 && $state.params.team_search && !_.isEmpty($state.params.team_search.page) && $state.params.team_search.page !== '1') {
if($scope.teams.length === 1 && $state.params.team_search && _.has($state, 'params.team_search.page') && $state.params.team_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.team_search.page = (parseInt(reloadListStateParams.team_search.page)-1).toString();
}

2
awx/ui/client/src/users/list/users-list.controller.js
View File

@ -68,7 +68,7 @@ export default ['$scope', '$rootScope', 'Rest', 'UserList', 'Prompt',
let reloadListStateParams = null;
if($scope.users.length === 1 && $state.params.user_search && !_.isEmpty($state.params.user_search.page) && $state.params.user_search.page !== '1') {
if($scope.users.length === 1 && $state.params.user_search && _.has($state, 'params.user_search.page') && $state.params.user_search.page !== '1') {
reloadListStateParams = _.cloneDeep($state.params);
reloadListStateParams.user_search.page = (parseInt(reloadListStateParams.user_search.page)-1).toString();
}