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

Activity Stream toggle should close AS

Browse Source 
Clicking the toggle while on the AS page wouldn't always remove the AS
This commit is contained in:
Jared Tabor
2016-07-06 14:38:52 -07:00
parent 3e0ed4c1a1
commit 0c3ba0d6b3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/src/bread-crumb/bread-crumb.directive.js
View File

@@ -6,7 +6,7 @@ export default
templateUrl: templateUrl('bread-crumb/bread-crumb'), templateUrl: templateUrl('bread-crumb/bread-crumb'),
link: function(scope) { link: function(scope) {
var streamConfig = {}; var streamConfig = {}, originalRoute;
scope.showActivityStreamButton = false; scope.showActivityStreamButton = false;
scope.showRefreshButton = false; scope.showRefreshButton = false;
@@ -30,7 +30,7 @@ export default
stateGoParams.id = $state.params[streamConfig.activityStreamId]; stateGoParams.id = $state.params[streamConfig.activityStreamId];
} }
} }
originalRoute = $state.current;
$state.go('activityStream', stateGoParams); $state.go('activityStream', stateGoParams);
} }
// The user is navigating away from the activity stream - take them back from whence they came // The user is navigating away from the activity stream - take them back from whence they came
@@ -38,7 +38,10 @@ export default
// Pull the previous state out of local storage // Pull the previous state out of local storage
var previousState = Store('previous_state'); var previousState = Store('previous_state');
if(previousState && !Empty(previousState.name)) { if(originalRoute) {
$state.go(originalRoute.name, originalRoute.fromParams);
}
else if(previousState && !Empty(previousState.name)) {
$state.go(previousState.name, previousState.fromParams); $state.go(previousState.name, previousState.fromParams);
} }
else { else {