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

Merge pull request #1089 from mabashian/activity-stream-hosts-subtitle

Browse Source 
Activity Stream bug fixes
This commit is contained in:
Michael Abashian
2016-03-02 15:07:57 -05:00
parent f27dde27d6 3c85e9e639
commit 35f1253bf4
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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,11 +38,11 @@ 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
$state.go('activityStream', {target: $scope.streamTarget}); $state.go('activityStream', {target: $scope.streamTarget}, {inherit: false});
} }
} }

5
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':
@@ -49,6 +49,9 @@ export default
case 'schedule': case 'schedule':
rtnTitle = 'SCHEDULES'; rtnTitle = 'SCHEDULES';
break; break;
case 'host':
rtnTitle = 'HOSTS';
break;
} }
return rtnTitle; return rtnTitle;