From 0504348d6971ae5f172be0f9422c91e4bc70d01a Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Thu, 15 Dec 2016 16:59:06 -0500
Subject: [PATCH] Removed Job Templates and Workflow Job Templates from the
 activity stream dropdown in favor of the combined Templates

---
 .../streamDropdownNav/stream-dropdown-nav.directive.js      | 4 +---
 awx/ui/client/src/helpers/ActivityStream.js                 | 6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)

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 cba0ecaddf..dc6c4a819d 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
@@ -20,15 +20,13 @@ export default ['templateUrl', function(templateUrl) {
                 {label: 'Hosts', value: 'host'},
                 {label: 'Inventories', value: 'inventory'},
                 {label: 'Inventory Scripts', value: 'inventory_script'},
-                {label: 'Job Templates', value: 'job_template'},
                 {label: 'Jobs', value: 'job'},
                 {label: 'Organizations', value: 'organization'},
                 {label: 'Projects', value: 'project'},
                 {label: 'Schedules', value: 'schedule'},
                 {label: 'Teams', value: 'team'},
                 {label: 'Templates', value: 'template'},
-                {label: 'Users', value: 'user'},
-                {label: 'Workflow Job Templates', value: 'workflow_job_template'}
+                {label: 'Users', value: 'user'}
             ];
 
             CreateSelect2({
diff --git a/awx/ui/client/src/helpers/ActivityStream.js b/awx/ui/client/src/helpers/ActivityStream.js
index 7dc8c9ecc0..37da4f2857 100644
--- a/awx/ui/client/src/helpers/ActivityStream.js
+++ b/awx/ui/client/src/helpers/ActivityStream.js
@@ -25,9 +25,6 @@ export default
                         case 'inventory':
                             rtnTitle = 'INVENTORIES';
                             break;
-                        case 'job_template':
-                            rtnTitle = 'JOB TEMPLATES';
-                            break;
                         case 'credential':
                             rtnTitle = 'CREDENTIALS';
                             break;
@@ -55,9 +52,6 @@ export default
                         case 'template':
                             rtnTitle = 'TEMPLATES';
                             break;
-                        case 'workflow_job_template':
-                            rtnTitle = 'WORKFLOW JOB TEMPLATES';
-                            break;
                     }
 
                     return rtnTitle;