diff --git a/awx/ui/client/features/applications/index.js b/awx/ui/client/features/applications/index.js index 448ea12f88..af4783884f 100644 --- a/awx/ui/client/features/applications/index.js +++ b/awx/ui/client/features/applications/index.js @@ -62,7 +62,7 @@ function ApplicationsRun ($stateExtender, strings) { }, data: { activityStream: true, - activityStreamTarget: 'application' + activityStreamTarget: 'o_auth2_application' }, views: { '@': { @@ -110,7 +110,7 @@ function ApplicationsRun ($stateExtender, strings) { }, data: { activityStream: true, - activityStreamTarget: 'application' + activityStreamTarget: 'o_auth2_application' }, views: { 'add@applications': { @@ -132,7 +132,7 @@ function ApplicationsRun ($stateExtender, strings) { }, data: { activityStream: true, - activityStreamTarget: 'application', + activityStreamTarget: 'o_auth2_application', activityStreamId: 'application_id' }, views: { @@ -262,8 +262,7 @@ function ApplicationsRun ($stateExtender, strings) { }, data: { activityStream: true, - // TODO: double-check activity stream works - activityStreamTarget: 'application' + activityStreamTarget: 'o_auth2_application' }, views: { 'userList@applications.edit': { diff --git a/awx/ui/client/src/activity-stream/get-target-title.factory.js b/awx/ui/client/src/activity-stream/get-target-title.factory.js index f782769c5c..88d274f58f 100644 --- a/awx/ui/client/src/activity-stream/get-target-title.factory.js +++ b/awx/ui/client/src/activity-stream/get-target-title.factory.js @@ -43,7 +43,7 @@ export default function GetTargetTitle(i18n) { case 'template': rtnTitle = i18n._('TEMPLATES'); break; - case 'application': + case 'o_auth2_application': rtnTitle = i18n._('APPLICATIONS'); break; } diff --git a/awx/ui/client/src/activity-stream/model-to-base-path-key.factory.js b/awx/ui/client/src/activity-stream/model-to-base-path-key.factory.js index f6a45e6bdd..2ce145c4dc 100644 --- a/awx/ui/client/src/activity-stream/model-to-base-path-key.factory.js +++ b/awx/ui/client/src/activity-stream/model-to-base-path-key.factory.js @@ -18,7 +18,7 @@ export default function ModelToBasePathKey() { var basePathKey; switch(model) { - case 'application': + case 'o_auth2_application': basePathKey = 'applications'; break; case 'project': diff --git a/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js b/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js index 601e65f1ac..e60170c310 100644 --- a/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js +++ b/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js @@ -21,7 +21,7 @@ export default ['templateUrl', 'i18n', function(templateUrl, i18n) { $scope.options = [ {label: i18n._('All Activity'), value: 'dashboard'}, - {label: i18n._('Applications'), value: 'application'}, + {label: i18n._('Applications'), value: 'o_auth2_application'}, {label: i18n._('Credentials'), value: 'credential'}, {label: i18n._('Hosts'), value: 'host'}, {label: i18n._('Inventories'), value: 'inventory'},