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

Removed reload: true since it's not needed to force a transition when going to the activity stream. Changed the "Dashboard" dropdown to "All Activity."

Browse Source
This commit is contained in:
Michael Abashian 2016-03-02 10:16:40 -05:00
parent b967caedaa
commit 3c85e9e639
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js
View File

@ -15,8 +15,8 @@ export default ['templateUrl', function(templateUrl) {
$scope.streamTarget = ($state.params && $state.params.target) ? $state.params.target : 'dashboard'; $scope.streamTarget = ($state.params && $state.params.target) ? $state.params.target : 'dashboard';
$scope.options = [ $scope.options = [
{label: 'All Activity', value: 'dashboard'},
{label: 'Credentials', value: 'credential'}, {label: 'Credentials', value: 'credential'},
{label: 'Dashboard', value: 'dashboard'},
{label: 'Hosts', value: 'host'}, {label: 'Hosts', value: 'host'},
{label: 'Inventories', value: 'inventory'}, {label: 'Inventories', value: 'inventory'},
{label: 'Inventory Scripts', value: 'inventory_script'}, {label: 'Inventory Scripts', value: 'inventory_script'},
@ -38,7 +38,7 @@ export default ['templateUrl', function(templateUrl) {
if($scope.streamTarget && $scope.streamTarget == 'dashboard') { if($scope.streamTarget && $scope.streamTarget == 'dashboard') {
// Just navigate to the base activity stream // Just navigate to the base activity stream
$state.go('activityStream', {}, {inherit: false, reload: true}); $state.go('activityStream', {}, {inherit: false});
} }
else { else {
// Attach the taget to the query parameters // Attach the taget to the query parameters

2
awx/ui/client/src/helpers/ActivityStream.js
View File

@ -16,7 +16,7 @@ export default
function () { function () {
return function (target) { return function (target) {
var rtnTitle = 'DASHBOARD'; var rtnTitle = 'ALL ACTIVITY';
switch(target) { switch(target) {
case 'project': case 'project':