shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

Merge pull request #2831 from jaredevantabor/activity-stream

Browse Source 
Activity Stream toggle should close AS
This commit is contained in:
Jared Tabor 2016-07-07 09:07:51 -07:00 committed by GitHub
commit 9357850718
1 changed files with 6 additions and 3 deletions
Show Stats 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'),
link: function(scope) {
var streamConfig = {};
var streamConfig = {}, originalRoute;
scope.showActivityStreamButton = false;
scope.showRefreshButton = false;
@ -30,7 +30,7 @@ export default
stateGoParams.id = $state.params[streamConfig.activityStreamId];
}
}
originalRoute = $state.current;
$state.go('activityStream', stateGoParams);
}
// 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
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);
}
else {