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

Merge pull request #3641 from mabashian/3536-inventory-update-redirect

Browse Source 
Stay on project/inventory manage pages when a sync is initiated
This commit is contained in:
Michael Abashian
2016-10-03 10:39:50 -04:00
committed by GitHub
parent 6697fe411c b4c5e31a1d
commit 3dc07859bc
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
View File

@@ -130,12 +130,20 @@ export default
goToJobDetails('managementJobStdout'); goToJobDetails('managementJobStdout');
} }
else if(_.has(data, 'project_update')) { else if(_.has(data, 'project_update')) {
if($state.current.name !== 'projects') { // If we are on the projects list or any child state of that list
// then we want to stay on that page. Otherwise go to the stdout
// view.
if(!$state.includes('projects')) {
goToJobDetails('scmUpdateStdout'); goToJobDetails('scmUpdateStdout');
} }
} }
else if(_.has(data, 'inventory_update')) { else if(_.has(data, 'inventory_update')) {
goToJobDetails('inventorySyncStdout'); // If we are on the inventory manage page or any child state of that
// page then we want to stay on that page. Otherwise go to the stdout
// view.
if(!$state.includes('inventoryManage')) {
goToJobDetails('inventorySyncStdout');
}
} }
} }
if(scope.clearDialog) { if(scope.clearDialog) {