From 45d037a2cc9bd2139c647f3222f4388d9d4ee96e Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Wed, 25 Apr 2018 21:12:13 -0400
Subject: [PATCH 001/169] don't prefer destructuring for arrays within es-lint

---
 awx/ui/.eslintrc.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/awx/ui/.eslintrc.js b/awx/ui/.eslintrc.js
index 217601f5f9..9a42d34ab2 100644
--- a/awx/ui/.eslintrc.js
+++ b/awx/ui/.eslintrc.js
@@ -54,6 +54,18 @@ module.exports = {
         'no-multiple-empty-lines': ['error', { max: 1 }],
         'object-curly-newline': 'off',
         'space-before-function-paren': ['error', 'always'],
-        'no-trailing-spaces': ['error']
-    }
+        'no-trailing-spaces': ['error'],
+        'prefer-destructuring': ['error', {
+            'VariableDeclarator': {
+              'array': false,
+              'object': true
+            },
+            'AssignmentExpression': {
+              'array': false,
+              'object': true
+            }
+          }, {
+            'enforceForRenamedProperties': false
+          }]
+      }
 };

From 6306ac2825828275a0a7e33892fd4f469fc330fc Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Tue, 10 Apr 2018 13:44:08 -0400
Subject: [PATCH 002/169] use field validation in both filter classes

---
 awx/api/filters.py                            | 145 ++++++++++--------
 .../tests/functional/api/test_inventory.py    |   5 +-
 awx/main/tests/unit/api/test_filters.py       |  29 +++-
 3 files changed, 113 insertions(+), 66 deletions(-)

diff --git a/awx/api/filters.py b/awx/api/filters.py
index 1c5a47f847..c7425f5e75 100644
--- a/awx/api/filters.py
+++ b/awx/api/filters.py
@@ -77,6 +77,65 @@ class TypeFilterBackend(BaseFilterBackend):
             raise ParseError(*e.args)
 
 
+def get_field_from_path(model, path):
+    '''
+    Given a Django ORM lookup path (possibly over multiple models)
+    Returns the last field in the line, and also the revised lookup path
+    ex., given
+        model=Organization
+        path='project__timeout'
+    returns tuple of field at the end of the line as well as a corrected
+    path, for special cases we do substitutions
+        (<IntegerField for timeout>, 'project__timeout')
+    '''
+    # Store of all the fields used to detect repeats
+    field_set = set([])
+    new_parts = []
+    for name in path.split('__'):
+        if model is None:
+            raise ParseError(_('No related model for field {}.').format(name))
+        # HACK: Make project and inventory source filtering by old field names work for backwards compatibility.
+        if model._meta.object_name in ('Project', 'InventorySource'):
+            name = {
+                'current_update': 'current_job',
+                'last_update': 'last_job',
+                'last_update_failed': 'last_job_failed',
+                'last_updated': 'last_job_run',
+            }.get(name, name)
+
+        if name == 'type' and 'polymorphic_ctype' in get_all_field_names(model):
+            name = 'polymorphic_ctype'
+            new_parts.append('polymorphic_ctype__model')
+        else:
+            new_parts.append(name)
+
+        if name in getattr(model, 'PASSWORD_FIELDS', ()):
+            raise PermissionDenied(_('Filtering on password fields is not allowed.'))
+        elif name == 'pk':
+            field = model._meta.pk
+        else:
+            name_alt = name.replace("_", "")
+            if name_alt in model._meta.fields_map.keys():
+                field = model._meta.fields_map[name_alt]
+                new_parts.pop()
+                new_parts.append(name_alt)
+            else:
+                field = model._meta.get_field(name)
+            if 'auth' in name or 'token' in name:
+                raise PermissionDenied(_('Filtering on %s is not allowed.' % name))
+            if isinstance(field, ForeignObjectRel) and getattr(field.field, '__prevent_search__', False):
+                raise PermissionDenied(_('Filtering on %s is not allowed.' % name))
+            elif getattr(field, '__prevent_search__', False):
+                raise PermissionDenied(_('Filtering on %s is not allowed.' % name))
+        if field in field_set:
+            # Field traversed twice, could create infinite JOINs, DoSing Tower
+            raise ParseError(_('Loops not allowed in filters, detected on field {}.').format(field.name))
+        field_set.add(field)
+        model = getattr(field, 'related_model', None)
+
+    return field, '__'.join(new_parts)
+
+
 class FieldLookupBackend(BaseFilterBackend):
     '''
     Filter using field lookups provided via query string parameters.
@@ -91,61 +150,23 @@ class FieldLookupBackend(BaseFilterBackend):
                          'isnull', 'search')
 
     def get_field_from_lookup(self, model, lookup):
-        field = None
-        parts = lookup.split('__')
-        if parts and parts[-1] not in self.SUPPORTED_LOOKUPS:
-            parts.append('exact')
+
+        if '__' in lookup and lookup.rsplit('__', 1)[-1] in self.SUPPORTED_LOOKUPS:
+            path, suffix = lookup.rsplit('__', 1)
+        else:
+            path = lookup
+            suffix = 'exact'
+
+        if not path:
+            raise ParseError(_('Query string field name not provided.'))
+
         # FIXME: Could build up a list of models used across relationships, use
         # those lookups combined with request.user.get_queryset(Model) to make
         # sure user cannot query using objects he could not view.
-        new_parts = []
+        field, new_path = get_field_from_path(model, path)
 
-        # Store of all the fields used to detect repeats
-        field_set = set([])
-
-        for name in parts[:-1]:
-            # HACK: Make project and inventory source filtering by old field names work for backwards compatibility.
-            if model._meta.object_name in ('Project', 'InventorySource'):
-                name = {
-                    'current_update': 'current_job',
-                    'last_update': 'last_job',
-                    'last_update_failed': 'last_job_failed',
-                    'last_updated': 'last_job_run',
-                }.get(name, name)
-
-            if name == 'type' and 'polymorphic_ctype' in get_all_field_names(model):
-                name = 'polymorphic_ctype'
-                new_parts.append('polymorphic_ctype__model')
-            else:
-                new_parts.append(name)
-
-            if name in getattr(model, 'PASSWORD_FIELDS', ()):
-                raise PermissionDenied(_('Filtering on password fields is not allowed.'))
-            elif name == 'pk':
-                field = model._meta.pk
-            else:
-                name_alt = name.replace("_", "")
-                if name_alt in model._meta.fields_map.keys():
-                    field = model._meta.fields_map[name_alt]
-                    new_parts.pop()
-                    new_parts.append(name_alt)
-                else:
-                    field = model._meta.get_field(name)
-                if 'auth' in name or 'token' in name:
-                    raise PermissionDenied(_('Filtering on %s is not allowed.' % name))
-                if isinstance(field, ForeignObjectRel) and getattr(field.field, '__prevent_search__', False):
-                    raise PermissionDenied(_('Filtering on %s is not allowed.' % name))
-                elif getattr(field, '__prevent_search__', False):
-                    raise PermissionDenied(_('Filtering on %s is not allowed.' % name))
-            if field in field_set:
-                # Field traversed twice, could create infinite JOINs, DoSing Tower
-                raise ParseError(_('Loops not allowed in filters, detected on field {}.').format(field.name))
-            field_set.add(field)
-            model = getattr(field, 'related_model', None) or field.model
-
-        if parts:
-            new_parts.append(parts[-1])
-        new_lookup = '__'.join(new_parts)
+        new_lookup = new_path
+        new_lookup = '__'.join([new_path, suffix])
         return field, new_lookup
 
     def to_python_related(self, value):
@@ -371,7 +392,7 @@ class OrderByBackend(BaseFilterBackend):
                     else:
                         order_by = (value,)
             if order_by:
-                order_by = self._strip_sensitive_model_fields(queryset.model, order_by)
+                order_by = self._validate_ordering_fields(queryset.model, order_by)
 
                 # Special handling of the type field for ordering. In this
                 # case, we're not sorting exactly on the type field, but
@@ -396,15 +417,17 @@ class OrderByBackend(BaseFilterBackend):
             # Return a 400 for invalid field names.
             raise ParseError(*e.args)
 
-    def _strip_sensitive_model_fields(self, model, order_by):
+    def _validate_ordering_fields(self, model, order_by):
         for field_name in order_by:
             # strip off the negation prefix `-` if it exists
-            _field_name = field_name.split('-')[-1]
+            prefix = ''
+            path = field_name
+            if field_name[0] == '-':
+                prefix = field_name[0]
+                path = field_name[1:]
             try:
-                # if the field name is encrypted/sensitive, don't sort on it
-                if _field_name in getattr(model, 'PASSWORD_FIELDS', ()) or \
-                        getattr(model._meta.get_field(_field_name), '__prevent_search__', False):
-                    raise ParseError(_('cannot order by field %s') % _field_name)
-            except FieldDoesNotExist:
-                pass
-            yield field_name
+                field, new_path = get_field_from_path(model, path)
+                new_path = '{}{}'.format(prefix, new_path)
+            except (FieldError, FieldDoesNotExist) as e:
+                raise ParseError(e.args[0])
+            yield new_path
diff --git a/awx/main/tests/functional/api/test_inventory.py b/awx/main/tests/functional/api/test_inventory.py
index c96bb8057c..2e4b7df63e 100644
--- a/awx/main/tests/functional/api/test_inventory.py
+++ b/awx/main/tests/functional/api/test_inventory.py
@@ -126,9 +126,8 @@ def test_list_cannot_order_by_unsearchable_field(get, organization, alice, order
         )
         custom_script.admin_role.members.add(alice)
 
-    response = get(reverse('api:inventory_script_list'), alice,
-                   QUERY_STRING='order_by=%s' % order_by, status=400)
-    assert response.status_code == 400
+    get(reverse('api:inventory_script_list'), alice,
+        QUERY_STRING='order_by=%s' % order_by, expect=403)
 
 
 @pytest.mark.parametrize("role_field,expected_status_code", [
diff --git a/awx/main/tests/unit/api/test_filters.py b/awx/main/tests/unit/api/test_filters.py
index 12ff3663a5..1a70b9716c 100644
--- a/awx/main/tests/unit/api/test_filters.py
+++ b/awx/main/tests/unit/api/test_filters.py
@@ -3,14 +3,18 @@
 import pytest
 
 from rest_framework.exceptions import PermissionDenied, ParseError
-from awx.api.filters import FieldLookupBackend
+from awx.api.filters import FieldLookupBackend, OrderByBackend, get_field_from_path
 from awx.main.models import (AdHocCommand, ActivityStream,
                              CustomInventoryScript, Credential, Job,
                              JobTemplate, SystemJob, UnifiedJob, User,
                              WorkflowJob, WorkflowJobTemplate,
-                             WorkflowJobOptions, InventorySource)
+                             WorkflowJobOptions, InventorySource,
+                             JobEvent)
 from awx.main.models.jobs import JobOptions
 
+# Django
+from django.db.models.fields import FieldDoesNotExist
+
 
 def test_related():
     field_lookup = FieldLookupBackend()
@@ -20,6 +24,27 @@ def test_related():
     print(new_lookup)
 
 
+def test_invalid_filter_key():
+    field_lookup = FieldLookupBackend()
+    # FieldDoesNotExist is caught and converted to ParseError by filter_queryset
+    with pytest.raises(FieldDoesNotExist) as excinfo:
+        field_lookup.value_to_python(JobEvent, 'event_data.task_action', 'foo')
+    assert 'has no field named' in str(excinfo)
+
+
+def test_invalid_field_hop():
+    with pytest.raises(ParseError) as excinfo:
+        get_field_from_path(Credential, 'organization__description__user')
+    assert 'No related model for' in str(excinfo)
+
+
+def test_invalid_order_by_key():
+    field_order_by = OrderByBackend()
+    with pytest.raises(ParseError) as excinfo:
+        [f for f in field_order_by._validate_ordering_fields(JobEvent, ('event_data.task_action',))]
+    assert 'has no field named' in str(excinfo)
+
+
 @pytest.mark.parametrize(u"empty_value", [u'', ''])
 def test_empty_in(empty_value):
     field_lookup = FieldLookupBackend()

From 9cc9bdc4b58b3c855cc268a7f7b1d0b2f7df8dc6 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Thu, 26 Apr 2018 13:21:28 -0400
Subject: [PATCH 003/169] clickable stdout events and host details modal for
 projects

---
 .../output/host-event/host-event.service.js   | 24 +++++++++++++++----
 .../client/features/output/render.service.js  | 16 ++++++++++++-
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/awx/ui/client/features/output/host-event/host-event.service.js b/awx/ui/client/features/output/host-event/host-event.service.js
index 4454bde27b..1e0588b329 100644
--- a/awx/ui/client/features/output/host-event/host-event.service.js
+++ b/awx/ui/client/features/output/host-event/host-event.service.js
@@ -5,13 +5,27 @@ function HostEventService (
     $rootScope
 ) {
     this.getUrl = (id, type, params) => {
-        let url;
+        const queryString = this.stringifyParams(params);
+
+        let baseUrl;
+        let related;
+
         if (type === 'playbook') {
-            url = `${GetBasePath('jobs')}${id}/job_events/?${this.stringifyParams(params)}`;
-        } else if (type === 'command') {
-            url = `${GetBasePath('ad_hoc_commands')}${id}/events/?${this.stringifyParams(params)}`;
+            baseUrl = GetBasePath('jobs');
+            related = 'job_events';
         }
-        return url;
+
+        if (type === 'command') {
+            baseUrl = GetBasePath('ad_hoc_commands');
+            related = 'events';
+        }
+
+        if (type === 'project') {
+            baseUrl = GetBasePath('project_updates');
+            related = 'events';
+        }
+
+        return `${baseUrl}${id}/${related}/?${queryString}`;
     };
 
     // GET events related to a job run
diff --git a/awx/ui/client/features/output/render.service.js b/awx/ui/client/features/output/render.service.js
index aa86913133..81728150fe 100644
--- a/awx/ui/client/features/output/render.service.js
+++ b/awx/ui/client/features/output/render.service.js
@@ -96,6 +96,20 @@ function JobRenderService ($q, $sce, $window) {
         return { html, count };
     };
 
+    this.isHostEvent = (event) => {
+        if (typeof event.host === 'number') {
+            return true;
+        }
+
+        if (event.type === 'project_update_event' &&
+            event.event !== 'runner_on_skipped' &&
+            event.event_data.host) {
+            return true;
+        }
+
+        return false;
+    };
+
     this.createRecord = (ln, lines, event) => {
         if (!event.uuid) {
             return null;
@@ -109,7 +123,7 @@ function JobRenderService ($q, $sce, $window) {
             start: event.start_line,
             end: event.end_line,
             isTruncated: (event.end_line - event.start_line) > lines.length,
-            isHost: typeof event.host === 'number'
+            isHost: this.isHostEvent(event),
         };
 
         if (event.parent_uuid) {

From 72254758f652f9c67aef7de60a86e881b23d171a Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 26 Apr 2018 13:22:39 -0400
Subject: [PATCH 004/169] add support for additional selects

---
 .../add-applications.controller.js            |  6 +---
 .../add-edit-applications.view.html           |  2 ++
 .../edit-applications.controller.js           |  6 +---
 .../lib/components/form/form.directive.js     |  4 ++-
 .../lib/components/input/base.controller.js   |  2 +-
 .../lib/components/input/select.directive.js  |  4 ++-
 awx/ui/client/lib/models/Application.js       | 31 ++++++++++++++++++-
 7 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/awx/ui/client/features/applications/add-applications.controller.js b/awx/ui/client/features/applications/add-applications.controller.js
index 173460157e..23453734fe 100644
--- a/awx/ui/client/features/applications/add-applications.controller.js
+++ b/awx/ui/client/features/applications/add-applications.controller.js
@@ -3,10 +3,8 @@ function AddApplicationsController (models, $state, strings) {
 
     const { application, me, organization } = models;
     const omit = [
-        'authorization_grant_type',
         'client_id',
         'client_secret',
-        'client_type',
         'created',
         'modified',
         'related',
@@ -54,9 +52,7 @@ function AddApplicationsController (models, $state, strings) {
 
     vm.form.save = data => {
         const hiddenData = {
-            authorization_grant_type: 'implicit',
-            user: me.get('id'),
-            client_type: 'public'
+            user: me.get('id')
         };
 
         const payload = _.merge(data, hiddenData);
diff --git a/awx/ui/client/features/applications/add-edit-applications.view.html b/awx/ui/client/features/applications/add-edit-applications.view.html
index a8d8d68e6c..9f2bbb96d3 100644
--- a/awx/ui/client/features/applications/add-edit-applications.view.html
+++ b/awx/ui/client/features/applications/add-edit-applications.view.html
@@ -15,6 +15,8 @@
             <at-input-lookup col="4" tab="3" state="vm.form.organization"></at-input-lookup>
             <at-divider></at-divider>
             <at-input-text col="4" tab="4" state="vm.form.redirect_uris"></at-input-text>
+            <at-input-select col="4" tab="5" state="vm.form.client_type"></at-input-select>
+            <at-input-select col="4" tab="6" state="vm.form.authorization_grant_type"></at-input-select>
 
             <at-action-group col="12" pos="right">
                 <at-form-action type="cancel" to="applications"></at-form-action>
diff --git a/awx/ui/client/features/applications/edit-applications.controller.js b/awx/ui/client/features/applications/edit-applications.controller.js
index 6279b642ee..6b7e21aed4 100644
--- a/awx/ui/client/features/applications/edit-applications.controller.js
+++ b/awx/ui/client/features/applications/edit-applications.controller.js
@@ -4,10 +4,8 @@ function EditApplicationsController (models, $state, strings, $scope) {
     const { me, application, organization } = models;
 
     const omit = [
-        'authorization_grant_type',
         'client_id',
         'client_secret',
-        'client_type',
         'created',
         'modified',
         'related',
@@ -90,9 +88,7 @@ function EditApplicationsController (models, $state, strings, $scope) {
 
     vm.form.save = data => {
         const hiddenData = {
-            authorization_grant_type: 'implicit',
-            user: me.get('id'),
-            client_type: 'public'
+            user: me.get('id')
         };
 
         const payload = _.merge(data, hiddenData);
diff --git a/awx/ui/client/lib/components/form/form.directive.js b/awx/ui/client/lib/components/form/form.directive.js
index dc19c61e2a..e0ac85c595 100644
--- a/awx/ui/client/lib/components/form/form.directive.js
+++ b/awx/ui/client/lib/components/form/form.directive.js
@@ -76,7 +76,9 @@ function AtFormController (eventService, strings) {
                     return values;
                 }
 
-                if (component.state._key && typeof component.state._value === 'object') {
+                if (component.state._format === 'selectFromOptions') {
+                    values[component.state.id] = component.state._value[0];
+                } else if (component.state._key && typeof component.state._value === 'object') {
                     values[component.state.id] = component.state._value[component.state._key];
                 } else if (component.state._group) {
                     values[component.state._key] = values[component.state._key] || {};
diff --git a/awx/ui/client/lib/components/input/base.controller.js b/awx/ui/client/lib/components/input/base.controller.js
index 5c27d903f0..75caad2f07 100644
--- a/awx/ui/client/lib/components/input/base.controller.js
+++ b/awx/ui/client/lib/components/input/base.controller.js
@@ -14,7 +14,7 @@ function BaseInputController (strings) {
         scope.state._required = scope.state.required || false;
         scope.state._isValid = scope.state._isValid || false;
         scope.state._disabled = scope.state._disabled || false;
-        scope.state._activeModel = '_value';
+        scope.state._activeModel = scope.state._activeModel || '_value';
 
         if (scope.state.ask_at_runtime) {
             scope.state._displayPromptOnLaunch = true;
diff --git a/awx/ui/client/lib/components/input/select.directive.js b/awx/ui/client/lib/components/input/select.directive.js
index 8507573a61..ddc0e23766 100644
--- a/awx/ui/client/lib/components/input/select.directive.js
+++ b/awx/ui/client/lib/components/input/select.directive.js
@@ -59,7 +59,9 @@ function AtInputSelectController (baseInputController, eventService) {
     };
 
     vm.updateDisplayModel = () => {
-        if (scope.state._format === 'array') {
+        if (scope.state._format === 'selectFromOptions') {
+            scope.displayModel = scope.state._value[1];
+        } else if (scope.state._format === 'array') {
             scope.displayModel = scope.state._value;
         } else if (scope.state._format === 'objects') {
             scope.displayModel = scope.state._value[scope.state._display];
diff --git a/awx/ui/client/lib/models/Application.js b/awx/ui/client/lib/models/Application.js
index 5c8cdbd066..1fa79a3661 100644
--- a/awx/ui/client/lib/models/Application.js
+++ b/awx/ui/client/lib/models/Application.js
@@ -1,6 +1,21 @@
 let Base;
 
 function createFormSchema (method, config) {
+    function mungeSelectFromOptions (configObj, value) {
+        configObj.choices = [['', '']].concat(configObj.choices);
+        configObj._data = configObj.choices;
+        configObj._exp = 'choice[1] for choice in state._data';
+        configObj._format = 'selectFromOptions';
+
+        configObj._data.forEach((val, i) => {
+            if (val[0] === value) {
+                configObj._value = configObj._data[i];
+            }
+        });
+
+        return configObj;
+    }
+
     if (!config) {
         config = method;
         method = 'GET';
@@ -15,11 +30,25 @@ function createFormSchema (method, config) {
     Object.keys(schema).forEach(key => {
         schema[key].id = key;
 
-        if (this.has(key)) {
+        if (this.has(key) && schema[key].type !== 'choice') {
             schema[key]._value = this.get(key);
         }
+
+        if (schema[key].type === 'choice') {
+            schema[key] = mungeSelectFromOptions(schema[key], this.get(key));
+        }
     });
 
+    // necessary because authorization_grant_type is not changeable on update
+    if (method === 'put') {
+        schema.authorization_grant_type = mungeSelectFromOptions(Object.assign({}, this
+            .options('actions.GET.authorization_grant_type')), this
+            .get('authorization_grant_type'));
+
+        schema.authorization_grant_type._required = false;
+        schema.authorization_grant_type._disabled = true;
+    }
+
     return schema;
 }
 

From 3bcc48402cc9d03721ce612030fe023d08c8338b Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 26 Apr 2018 13:23:03 -0400
Subject: [PATCH 005/169] add support for applications activity stream

---
 awx/ui/client/features/applications/index.js                   | 2 --
 awx/ui/client/src/activity-stream/get-target-title.factory.js  | 3 +++
 .../src/activity-stream/model-to-base-path-key.factory.js      | 3 +++
 .../streamDropdownNav/stream-dropdown-nav.directive.js         | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/features/applications/index.js b/awx/ui/client/features/applications/index.js
index ca70be6165..448ea12f88 100644
--- a/awx/ui/client/features/applications/index.js
+++ b/awx/ui/client/features/applications/index.js
@@ -62,7 +62,6 @@ function ApplicationsRun ($stateExtender, strings) {
         },
         data: {
             activityStream: true,
-            // TODO: double-check activity stream works
             activityStreamTarget: 'application'
         },
         views: {
@@ -111,7 +110,6 @@ function ApplicationsRun ($stateExtender, strings) {
         },
         data: {
             activityStream: true,
-            // TODO: double-check activity stream works
             activityStreamTarget: 'application'
         },
         views: {
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 3921f2d530..f782769c5c 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,6 +43,9 @@ export default function GetTargetTitle(i18n) {
             case 'template':
                 rtnTitle = i18n._('TEMPLATES');
                 break;
+            case 'application':
+                rtnTitle = i18n._('APPLICATIONS');
+                break;
         }
 
         return rtnTitle;
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 10285871d0..f6a45e6bdd 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,6 +18,9 @@ export default function ModelToBasePathKey() {
         var basePathKey;
 
         switch(model) {
+            case 'application':
+                basePathKey = 'applications';
+                break;
             case 'project':
                 basePathKey = 'projects';
                 break;
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 7231cdd9c2..601e65f1ac 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,6 +21,7 @@ export default ['templateUrl', 'i18n', function(templateUrl, i18n) {
 
             $scope.options = [
                 {label: i18n._('All Activity'), value: 'dashboard'},
+                {label: i18n._('Applications'), value: 'application'},
                 {label: i18n._('Credentials'), value: 'credential'},
                 {label: i18n._('Hosts'), value: 'host'},
                 {label: i18n._('Inventories'), value: 'inventory'},

From 61757fb2b1b535dcc2a9595fbfd3077d4ab0b203 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Thu, 26 Apr 2018 13:24:41 -0400
Subject: [PATCH 006/169] improve traceback details label

---
 awx/ui/client/features/output/details.directive.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/features/output/details.directive.js b/awx/ui/client/features/output/details.directive.js
index eb2b7277c7..b19475f70a 100644
--- a/awx/ui/client/features/output/details.directive.js
+++ b/awx/ui/client/features/output/details.directive.js
@@ -290,7 +290,7 @@ function getResultTracebackDetails () {
     }
 
     const limit = 150;
-    const label = 'Results Traceback';
+    const label = 'Error Details';
 
     const more = traceback;
     const less = $filter('limitTo')(more, limit);

From f99792e604d326732c163cd30a97af3be3f2da69 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 26 Apr 2018 17:06:20 -0400
Subject: [PATCH 007/169] make selects work with ng required

---
 awx/ui/client/lib/components/input/base.controller.js | 3 ++-
 awx/ui/client/lib/models/Application.js               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/lib/components/input/base.controller.js b/awx/ui/client/lib/components/input/base.controller.js
index 75caad2f07..32fa30b458 100644
--- a/awx/ui/client/lib/components/input/base.controller.js
+++ b/awx/ui/client/lib/components/input/base.controller.js
@@ -49,7 +49,8 @@ function BaseInputController (strings) {
                 scope.state._touched = true;
             }
 
-            if (scope.state._required && !scope.state._value && !scope.state._displayValue) {
+            if (scope.state._required && (!scope.state._value || !scope.state._value[0]) &&
+                !scope.state._displayValue) {
                 isValid = false;
                 message = vm.strings.get('message.REQUIRED_INPUT_MISSING');
             } else if (scope.state._validate) {
diff --git a/awx/ui/client/lib/models/Application.js b/awx/ui/client/lib/models/Application.js
index 1fa79a3661..2a364eb9e7 100644
--- a/awx/ui/client/lib/models/Application.js
+++ b/awx/ui/client/lib/models/Application.js
@@ -2,7 +2,7 @@ let Base;
 
 function createFormSchema (method, config) {
     function mungeSelectFromOptions (configObj, value) {
-        configObj.choices = [['', '']].concat(configObj.choices);
+        configObj.choices = [[null, '']].concat(configObj.choices);
         configObj._data = configObj.choices;
         configObj._exp = 'choice[1] for choice in state._data';
         configObj._format = 'selectFromOptions';

From 35bd98eb49807e82c2ac113b66b6cc08c4e11cde Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Thu, 26 Apr 2018 16:36:53 -0400
Subject: [PATCH 008/169] Fix job result detail and standard out panel styles

---
 awx/ui/client/features/output/_index.less     | 169 ++-----
 .../features/output/details.partial.html      | 429 +++++++++---------
 awx/ui/client/features/output/index.view.html | 114 +++--
 .../client/features/output/stats.partial.html |  21 +-
 4 files changed, 315 insertions(+), 418 deletions(-)

diff --git a/awx/ui/client/features/output/_index.less b/awx/ui/client/features/output/_index.less
index 4238573fb3..0bb8a72aba 100644
--- a/awx/ui/client/features/output/_index.less
+++ b/awx/ui/client/features/output/_index.less
@@ -6,6 +6,7 @@
         border-top-left-radius: 4px;
         border-top-right-radius: 4px;
         border-bottom: none;
+        margin-top: 15px;
 
         & > div {
             user-select: none;
@@ -123,7 +124,7 @@
 
     &-container {
         font-family: monospace;
-        height: calc(~"100vh - 240px");
+        height: 100%;
         overflow-y: scroll;
         font-size: 15px;
         border: 1px solid @at-gray-b7;
@@ -143,6 +144,11 @@
             }
         }
     }
+
+    &--fullscreen {
+        grid-column-start: 1;
+        grid-column-end: 3;
+    }
 }
 
 .at-mixin-event() {
@@ -201,12 +207,12 @@
     flex-wrap: wrap;
 }
 
-
 // Status Bar -----------------------------------------------------------------------------
 .HostStatusBar {
     display: flex;
     flex: 0 0 auto;
     width: 100%;
+    margin-bottom: 15px;
 }
 
 .HostStatusBar-ok,
@@ -282,49 +288,28 @@
 
 }
 
+.HostStatusBar-tooltip.top {
+    margin-top: 4px;
+}
+
 // Job Details ---------------------------------------------------------------------------------
 
 @breakpoint-md: 1200px;
 
-.JobResults {
-    .OnePlusTwo-container(100%, @breakpoint-md);
+.JobResults-container {
+    display: grid;
+    grid-gap: 20px;
+    grid-template-columns: minmax(300px, 1fr) minmax(500px, 2fr);
+    grid-template-rows: minmax(500px, ~"calc(100vh - 140px)");
 
-    &.fullscreen {
-        .JobResults-rightSide {
-            max-width: 100%;
-        }
+    .at-Panel {
+        overflow-y: scroll;
     }
 }
 
-.JobResults-leftSide {
-    .OnePlusTwo-left--panel(100%, @breakpoint-md);
-    max-width: 30%;
-    height: ~"calc(100vh - 177px)";
-
-    @media screen and (max-width: @breakpoint-md) {
-        max-width: 100%;
-    }
-}
-
-.JobResults-rightSide {
-    .OnePlusTwo-right--panel(100%, @breakpoint-md);
-    height: ~"calc(100vh - 177px)";
-
-    @media (max-width: @breakpoint-md - 1px) {
-        padding-right: 15px;
-    }
-}
-
-.JobResults-detailsPanel{
-    overflow-y: scroll;
-}
-
-.JobResults-stdoutActionButton--active {
-    display: none;
-    visibility: hidden;
-    flex:none;
-    width:0px;
-    padding-right: 0px;
+.JobResults-detailsPanel {
+    display: flex;
+    flex-direction: column;
 }
 
 .JobResults-panelHeader {
@@ -352,8 +337,8 @@
     flex-wrap: wrap;
 }
 
-.JobResults-codeMirrorResultRowLabel{
-    font-size: 12px;
+.JobResults-resultRow #cm-variables-container {
+    width: 100%;
 }
 
 .JobResults-resultRowLabel {
@@ -416,109 +401,10 @@
     padding-right: 10px;
 }
 
-.JobResults-badgeRow {
-    display: flex;
-    align-items: center;
-    margin-right: 5px;
-}
-
-.JobResults-badgeTitle{
-    color: @default-interface-txt;
-    font-size: 14px;
-    margin-right: 10px;
-    font-weight: normal;
-    text-transform: uppercase;
-    margin-left: 20px;
-}
-
-@media (max-width: @breakpoint-md) {
-    .JobResults-detailsPanel {
-        overflow-y: auto;
-    }
-
-    .JobResults-rightSide {
-        height: inherit;
-    }
-}
-
-.JobResults-timeBadge {
-    float:right;
-    font-size: 11px;
-    font-weight: normal;
-    padding: 1px 10px;
-    height: 14px;
-    margin: 3px 15px;
-    width: 80px;
-    background-color: @default-bg;
-    border-radius: 5px;
-    color: @default-interface-txt;
-    margin-right: -5px;
-}
-
-.JobResults-panelRight {
-    display: flex;
-    flex-direction: column;
-}
-
-.JobResults-panelRight .SmartSearch-bar {
-    width: 100%;
-}
-
-.JobResults-panelRightTitle{
-    flex-wrap: wrap;
-}
-
-.JobResults-panelRightTitleText{
-    word-wrap: break-word;
-    word-break: break-all;
-    max-width: 100%;
-}
-
-.JobResults-badgeAndActionRow{
-    display:flex;
-    flex: 1 0 auto;
-    justify-content: flex-end;
-    flex-wrap: wrap;
-    max-width: 100%;
-}
-
 .StandardOut-panelHeader {
     flex: initial;
 }
 
-.StandardOut-panelHeader--jobIsRunning {
-    margin-bottom: 20px;
-}
-
-host-status-bar {
-    flex: initial;
-    margin-bottom: 20px;
-}
-
-smart-search {
-    flex: initial;
-}
-
-job-results-standard-out {
-    flex: 1;
-    flex-basis: auto;
-    height: ~"calc(100% - 800px)";
-    display: flex;
-    border: 1px solid @d7grey;
-    border-radius: 5px;
-    margin-top: 20px;
-}
-@media screen and (max-width: @breakpoint-md) {
-  job-results-standard-out {
-      height: auto;
-  }
-}
-
-.JobResults-extraVarsHelp {
-    margin-left: 10px;
-    color: @default-icon;
-}
-
 .JobResults-seeMoreLess {
     color: #337AB7;
     margin: 4px 0px;
@@ -528,3 +414,10 @@ job-results-standard-out {
     border-radius: 5px;
     font-size: 11px;
 }
+
+@media screen and (max-width: @breakpoint-md) {
+    .JobResults-container {
+        display: flex;
+        flex-direction: column;
+    }
+}
\ No newline at end of file
diff --git a/awx/ui/client/features/output/details.partial.html b/awx/ui/client/features/output/details.partial.html
index d873c4fbb5..5eb4f5b146 100644
--- a/awx/ui/client/features/output/details.partial.html
+++ b/awx/ui/client/features/output/details.partial.html
@@ -40,248 +40,247 @@
 </div>
 
 <!-- LEFT PANE DETAILS GROUP -->
-<div>
-    <!-- STATUS DETAIL -->
-    <div class="JobResults-resultRow">
-        <label class="JobResults-resultRowLabel">{{ vm.status.label }}</label>
-        <div class="JobResults-resultRowText">
-            <i class="JobResults-statusResultIcon {{ vm.status.icon }}"></i>
-            {{ vm.status.value }}
-        </div>
+<!-- STATUS DETAIL -->
+<div class="JobResults-resultRow">
+    <label class="JobResults-resultRowLabel">{{ vm.status.label }}</label>
+    <div class="JobResults-resultRowText">
+        <i class="JobResults-statusResultIcon {{ vm.status.icon }}"></i>
+        {{ vm.status.value }}
     </div>
+</div>
 
-    <!-- EXPLANATION DETAIL -->
-    <div class="JobResults-resultRow" ng-show="vm.jobExplanation">
-        <label class="JobResults-resultRowLabel">{{ vm.jobExplanation.label }}</label>
-        <div class="JobResults-resultRowText"
-             ng-show="!vm.jobExplanation.showMore">
-            {{ vm.jobExplanation.less }}
-            <span ng-show="vm.jobExplanation.hasMoreToShow">...</span>
-            <span ng-show="vm.jobExplanation.hasMoreToShow"
-                  class="JobResults-seeMoreLess"
-                  ng-click="vm.jobExplanation.showMore = true">
-                Show More
-            </span>
-        </div>
-        <div class="JobResults-resultRowText"
-             ng-show="vm.jobExplanation.showMore">
-            {{ vm.jobExplanation.more }}
-            <span class="JobResults-seeMoreLess"
-                  ng-click="vm.jobExplanation.showMore = false">
-                Show Less
-            </span>
-        </div>
+<!-- EXPLANATION DETAIL -->
+<div class="JobResults-resultRow" ng-show="vm.jobExplanation">
+    <label class="JobResults-resultRowLabel">{{ vm.jobExplanation.label }}</label>
+    <div class="JobResults-resultRowText"
+            ng-show="!vm.jobExplanation.showMore">
+        {{ vm.jobExplanation.less }}
+        <span ng-show="vm.jobExplanation.hasMoreToShow">...</span>
+        <span ng-show="vm.jobExplanation.hasMoreToShow"
+                class="JobResults-seeMoreLess"
+                ng-click="vm.jobExplanation.showMore = true">
+            Show More
+        </span>
     </div>
-
-    <!-- START TIME DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.started">
-        <label class="JobResults-resultRowLabel">{{ vm.started.label }}</label>
-        <div class="JobResults-resultRowText">
-            {{ vm.started.value }}
-        </div>
+    <div class="JobResults-resultRowText"
+            ng-show="vm.jobExplanation.showMore">
+        {{ vm.jobExplanation.more }}
+        <span class="JobResults-seeMoreLess"
+                ng-click="vm.jobExplanation.showMore = false">
+            Show Less
+        </span>
     </div>
+</div>
 
-    <!-- FINISHED TIME DETAIL -->
-    <div class="JobResults-resultRow" ng-show="vm.started">
-        <label class="JobResults-resultRowLabel">{{ vm.finished.label }}</label>
-        <div class="JobResults-resultRowText">
-            {{ vm.finished.value }}
-        </div>
+<!-- START TIME DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.started">
+    <label class="JobResults-resultRowLabel">{{ vm.started.label }}</label>
+    <div class="JobResults-resultRowText">
+        {{ vm.started.value }}
     </div>
+</div>
 
-    <!-- module args -->
-    <div class="JobResults-resultRow" ng-if="vm.moduleArgs">
-        <label class="JobResults-resultRowLabel">{{ vm.moduleArgs.label }}</label>
-        <div class="JobResults-resultRowText">{{ vm.moduleArgs.value }}</div>
+<!-- FINISHED TIME DETAIL -->
+<div class="JobResults-resultRow" ng-show="vm.started">
+    <label class="JobResults-resultRowLabel">{{ vm.finished.label }}</label>
+    <div class="JobResults-resultRowText">
+        {{ vm.finished.value }}
     </div>
+</div>
 
-    <!-- RESULTS TRACEBACK DETAIL -->
-    <div class="JobResults-resultRow" ng-show="vm.resultTraceback">
-        <label class="JobResults-resultRowLabel">{{ vm.resultTraceback.label }}</label>
-        <div class="JobResults-resultRowText"
-             ng-show="!vm.resultTraceback.showMore">
-            {{ vm.resultTraceback.less }}
-            <span ng-show="vm.resultTraceback.hasMoreToShow">...</span>
-            <span ng-show="vm.resultTraceback.hasMoreToShow"
-                  class="JobResults-seeMoreLess"
-                  ng-click="vm.resultTraceback.showMore = true">
-                Show More
-            </span>
-        </div>
-        <div class="JobResults-resultRowText"
-             ng-show="vm.resultTraceback.showMore">
-            {{ vm.resultTraceback.more }}
-            <span class="JobResults-seeMoreLess"
-                  ng-click="vm.resultTraceback.showMore = false">
-                Show Less
-            </span>
-        </div>
+<!-- module args -->
+<div class="JobResults-resultRow" ng-if="vm.moduleArgs">
+    <label class="JobResults-resultRowLabel">{{ vm.moduleArgs.label }}</label>
+    <div class="JobResults-resultRowText">{{ vm.moduleArgs.value }}</div>
+</div>
+
+<!-- RESULTS TRACEBACK DETAIL -->
+<div class="JobResults-resultRow" ng-show="vm.resultTraceback">
+    <label class="JobResults-resultRowLabel">{{ vm.resultTraceback.label }}</label>
+    <div class="JobResults-resultRowText"
+            ng-show="!vm.resultTraceback.showMore">
+        {{ vm.resultTraceback.less }}
+        <span ng-show="vm.resultTraceback.hasMoreToShow">...</span>
+        <span ng-show="vm.resultTraceback.hasMoreToShow"
+                class="JobResults-seeMoreLess"
+                ng-click="vm.resultTraceback.showMore = true">
+            Show More
+        </span>
     </div>
-
-    <!-- TEMPLATE DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.jobTemplate">
-        <label class="JobResults-resultRowLabel">{{ vm.jobTemplate.label }}</label>
-        <div class="JobResults-resultRowText">
-            <a href="{{ vm.jobTemplate.link }}"
-               aw-tool-tip="{{ vm.jobTemplate.tooltip }}"
-               data-placement="top"
-               data-tip-watch="vm.jobTemplate.tooltip">
-                {{ vm.jobTemplate.value }}
-            </a>
-
-            <a href="{{ vm.sourceWorkflowJob.link }}" 
-               ng-if="vm.sourceWorkflowJob"
-               aw-tool-tip="{{ vm.sourceWorkflowJob.tooltip }}" data-placement="top">
-                <i class="WorkflowBadge"> W</i>
-            </a>
-        </div>
+    <div class="JobResults-resultRowText"
+            ng-show="vm.resultTraceback.showMore">
+        {{ vm.resultTraceback.more }}
+        <span class="JobResults-seeMoreLess"
+                ng-click="vm.resultTraceback.showMore = false">
+            Show Less
+        </span>
     </div>
+</div>
 
-    <!-- JOB TYPE DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.jobType">
-        <label class="JobResults-resultRowLabel">{{ vm.jobType.label }}</label>
-        <div class="JobResults-resultRowText">{{ vm.jobType.value }}</div>
+<!-- TEMPLATE DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.jobTemplate">
+    <label class="JobResults-resultRowLabel">{{ vm.jobTemplate.label }}</label>
+    <div class="JobResults-resultRowText">
+        <a href="{{ vm.jobTemplate.link }}"
+            aw-tool-tip="{{ vm.jobTemplate.tooltip }}"
+            data-placement="top"
+            data-tip-watch="vm.jobTemplate.tooltip">
+            {{ vm.jobTemplate.value }}
+        </a>
+
+        <a href="{{ vm.sourceWorkflowJob.link }}"
+            ng-if="vm.sourceWorkflowJob"
+            aw-tool-tip="{{ vm.sourceWorkflowJob.tooltip }}" data-placement="top">
+            <i class="WorkflowBadge"> W</i>
+        </a>
     </div>
+</div>
 
-    <!-- LAUNCHED BY DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.launchedBy">
-        <label class="JobResults-resultRowLabel">{{ vm.launchedBy.label }}</label>
-        <div ng-if="vm.launchedBy.link" class="JobResults-resultRowText">
-            <a href="{{ vm.launchedBy.link }}" aw-tool-tip="{{ vm.launchedBy.tooltip }}" data-placement="top">
-                {{ vm.launchedBy.value }}
-            </a>
-        </div>
-        <div ng-if="!vm.launchedBy.link" class="jobResults-resultRowText">
+<!-- JOB TYPE DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.jobType">
+    <label class="JobResults-resultRowLabel">{{ vm.jobType.label }}</label>
+    <div class="JobResults-resultRowText">{{ vm.jobType.value }}</div>
+</div>
+
+<!-- LAUNCHED BY DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.launchedBy">
+    <label class="JobResults-resultRowLabel">{{ vm.launchedBy.label }}</label>
+    <div ng-if="vm.launchedBy.link" class="JobResults-resultRowText">
+        <a href="{{ vm.launchedBy.link }}" aw-tool-tip="{{ vm.launchedBy.tooltip }}" data-placement="top">
             {{ vm.launchedBy.value }}
-        </div>
+        </a>
     </div>
-
-    <!-- INVENTORY DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.inventory">
-        <label class="JobResults-resultRowLabel">{{ vm.inventory.label }}</label>
-        <div class="JobResults-resultRowText">
-            <a href="{{ vm.inventory.link }}" aw-tool-tip="{{ vm.inventory.tooltip }}" data-placement="top">
-                {{ vm.inventory.value }}
-            </a>
-        </div>
+    <div ng-if="!vm.launchedBy.link" class="jobResults-resultRowText">
+        {{ vm.launchedBy.value }}
     </div>
+</div>
 
-    <!-- PROJECT DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.project">
-        <label class="JobResults-resultRowLabel">{{ vm.project.label }}</label>
-        <div class="JobResults-resultRowText">
-            <a href="{{ vm.projectUpdate.link }}"
-                ng-if="vm.projectUpdate"
-                aw-tool-tip="{{ vm.projectUpdate.tooltip }}"
-                data-placement="top">
-                <i ng-if="vm.projectStatus" class="JobResults-statusResultIcon fa icon-job-{{ vm.projectStatus }}"></i>
-            </a>
-            <a href="{{ vm.project.link }}"
-                aw-tool-tip="{{ vm.project.tooltip }}"
-                data-placement="top">
-                {{ vm.project.value }}
-            </a>
-        </div>
+<!-- INVENTORY DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.inventory">
+    <label class="JobResults-resultRowLabel">{{ vm.inventory.label }}</label>
+    <div class="JobResults-resultRowText">
+        <a href="{{ vm.inventory.link }}" aw-tool-tip="{{ vm.inventory.tooltip }}" data-placement="top">
+            {{ vm.inventory.value }}
+        </a>
     </div>
+</div>
 
-    <!-- REVISION DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.scmRevision">
-        <label class="JobResults-resultRowLabel">{{ vm.scmRevision.label }}</label>
-        <at-truncate string="{{ vm.scmRevision.value }}" maxLength="7" class="JobResults-resultRowText"></at-truncate>
+<!-- PROJECT DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.project">
+    <label class="JobResults-resultRowLabel">{{ vm.project.label }}</label>
+    <div class="JobResults-resultRowText">
+        <a href="{{ vm.projectUpdate.link }}"
+            ng-if="vm.projectUpdate"
+            aw-tool-tip="{{ vm.projectUpdate.tooltip }}"
+            data-placement="top">
+            <i ng-if="vm.projectStatus" class="JobResults-statusResultIcon fa icon-job-{{ vm.projectStatus }}"></i>
+        </a>
+        <a href="{{ vm.project.link }}"
+            aw-tool-tip="{{ vm.project.tooltip }}"
+            data-placement="top">
+            {{ vm.project.value }}
+        </a>
     </div>
+</div>
 
-    <!-- PLAYBOOK DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.playbook">
-        <label class="JobResults-resultRowLabel">{{ vm.playbook.label }}</label>
-        <div class="JobResults-resultRowText">{{ vm.playbook.value }}</div>
+<!-- REVISION DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.scmRevision">
+    <label class="JobResults-resultRowLabel">{{ vm.scmRevision.label }}</label>
+    <at-truncate string="{{ vm.scmRevision.value }}" maxLength="7" class="JobResults-resultRowText"></at-truncate>
+</div>
+
+<!-- PLAYBOOK DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.playbook">
+    <label class="JobResults-resultRowLabel">{{ vm.playbook.label }}</label>
+    <div class="JobResults-resultRowText">{{ vm.playbook.value }}</div>
+</div>
+
+<!-- CREDENTIAL DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.credential">
+    <label class="JobResults-resultRowLabel">{{ vm.credential.label }}</label>
+    <div class="JobResults-resultRowText">
+        <a href="{{ vm.credential.link }}"
+            aw-tool-tip="{{ vm.credential.tooltip }}"
+            data-placement="top"
+            data-tip-watch="vm.credential.tooltip">
+            {{ vm.credential.value }}
+        </a>
     </div>
+</div>
 
-    <!-- CREDENTIAL DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.credential">
-        <label class="JobResults-resultRowLabel">{{ vm.credential.label }}</label>
-        <div class="JobResults-resultRowText">
-            <a href="{{ vm.credential.link }}"
-                aw-tool-tip="{{ vm.credential.tooltip }}"
-                data-placement="top"
-                data-tip-watch="vm.credential.tooltip">
-                {{ vm.credential.value }}
-            </a>
-        </div>
+<!-- FORKS DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.forks">
+    <label class="JobResults-resultRowLabel">{{ vm.forks.label }}</label>
+    <div class="JobResults-resultRowText">{{ vm.forks.value }}</div>
+</div>
+
+<!-- LIMIT DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.limit">
+    <label class="JobResults-resultRowLabel">{{ vm.limit.label }}</label>
+    <div class="JobResults-resultRowText">{{ vm.limit.value }}</div>
+</div>
+
+<!-- VERBOSITY DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.verbosity">
+    <label class="JobResults-resultRowLabel">{{ vm.verbosity.label }}</label>
+    <div class="JobResults-resultRowText">{{ vm.verbosity.value }}</div>
+</div>
+
+<!-- IG DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.instanceGroup">
+    <label class="JobResults-resultRowLabel">{{ vm.instanceGroup.label }}</label>
+    <div class="JobResults-resultRowText JobResults-resultRowText--instanceGroup">
+        {{ vm.instanceGroup.value }}
+        <span class="JobResults-isolatedBadge" ng-if="vm.instanceGroup.isolated">
+            {{ vm.instanceGroup.isolated }}
+        </span>
     </div>
+</div>
 
-    <!-- FORKS DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.forks">
-        <label class="JobResults-resultRowLabel">{{ vm.forks.label }}</label>
-        <div class="JobResults-resultRowText">{{ vm.forks.value }}</div>
+<!-- TAGS DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.jobTags">
+    <label class="JobResults-resultRowLabel">{{ vm.jobTags.label }}</label>
+    <div class="JobResults-resultRowText">{{ vm.jobTags.value }}</div>
+</div>
+
+<!-- SKIP TAGS DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.skipTags">
+    <label class="JobResults-resultRowLabel">{{ vm.skipTags.label }}</label>
+    <div class="JobResults-resultRowText"> {{ vm.skipTags.value }}</div>
+</div>
+
+<!-- EXTRA VARIABLES DETAIL -->
+<at-code-mirror
+    class="JobResults-resultRow"
+    ng-if="vm.extraVars"
+    variables="{{ vm.extraVars.value }}"
+    tooltip="{{ vm.extraVars.tooltip }}"
+    label="{{ vm.extraVars.label}}"
+    label-class="JobResults-resultRowLabel"
+    disabled="{{ vm.extraVars.disabled }}">
+</at-code-mirror>
+
+<!-- LABELS DETAIL -->
+<div class="JobResults-resultRow" ng-show="vm.labels">
+    <div class="JobResults-resultRow">
+        <a class="JobResults-resultRowLabel JobResults-resultRowLabel--fullWidth"
+            ng-show="vm.labels.more"
+            href=""
+            ng-click="vm.toggleLabels()">
+            <span translate>Labels</span>
+            <i class="JobResults-expandArrow fa fa-caret-right"></i>
+        </a>
+        <a class="JobResults-resultRowLabel JobResults-resultRowLabel--fullWidth"
+            ng-show="!vm.labels.more"
+            href=""
+            ng-click="vm.toggleLabels()">
+            <span translate>Labels</span>
+            <i class="JobResults-expandArrow fa fa-caret-down"></i>
+        </a>
     </div>
-
-    <!-- LIMIT DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.limit">
-        <label class="JobResults-resultRowLabel">{{ vm.limit.label }}</label>
-        <div class="JobResults-resultRowText">{{ vm.limit.value }}</div>
-    </div>
-
-    <!-- VERBOSITY DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.verbosity">
-        <label class="JobResults-resultRowLabel">{{ vm.verbosity.label }}</label>
-        <div class="JobResults-resultRowText">{{ vm.verbosity.value }}</div>
-    </div>
-
-    <!-- IG DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.instanceGroup">
-        <label class="JobResults-resultRowLabel">{{ vm.instanceGroup.label }}</label>
-        <div class="JobResults-resultRowText JobResults-resultRowText--instanceGroup">
-            {{ vm.instanceGroup.value }}
-            <span class="JobResults-isolatedBadge" ng-if="vm.instanceGroup.isolated">
-                {{ vm.instanceGroup.isolated }}
-            </span>
-        </div>
-    </div>
-
-    <!-- TAGS DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.jobTags">
-        <label class="JobResults-resultRowLabel">{{ vm.jobTags.label }}</label>
-        <div class="JobResults-resultRowText">{{ vm.jobTags.value }}</div>
-    </div>
-
-    <!-- SKIP TAGS DETAIL -->
-    <div class="JobResults-resultRow" ng-if="vm.skipTags">
-        <label class="JobResults-resultRowLabel">{{ vm.skipTags.label }}</label>
-        <div class="JobResults-resultRowText"> {{ vm.skipTags.value }}</div>
-    </div>
-
-    <!-- EXTRA VARIABLES DETAIL -->
-    <at-code-mirror
-        ng-if="vm.extraVars"
-        variables="{{ vm.extraVars.value }}"
-        tooltip="{{ vm.extraVars.tooltip }}"
-        label="{{ vm.extraVars.label}}"
-        label-class="JobResults-codeMirrorResultRowLabel"
-        disabled="{{ vm.extraVars.disabled }}">
-    </at-code-mirror>
-
-    <!-- LABELS DETAIL -->
-    <div class="JobResults-resultRow" ng-show="vm.labels">
-        <div class="JobResults-resultRow">
-            <a class="JobResults-resultRowLabel JobResults-resultRowLabel--fullWidth"
-                ng-show="vm.labels.more"
-                href=""
-                ng-click="vm.toggleLabels()">
-                <span translate>Labels</span>
-                <i class="JobResults-expandArrow fa fa-caret-right"></i>
-            </a>
-            <a class="JobResults-resultRowLabel JobResults-resultRowLabel--fullWidth"
-                ng-show="!vm.labels.more"
-                href=""
-                ng-click="vm.toggleLabels()">
-                <span translate>Labels</span>
-                <i class="JobResults-expandArrow fa fa-caret-down"></i>
-            </a>
-        </div>
-        <div id="job-results-labels" class="LabelList JobResults-resultRowText JobResults-resultRowText--fullWidth">
-            <div ng-repeat="label in vm.labels.value" class="LabelList-tagContainer">
-                <div class="LabelList-tag"><div class="LabelList-name">{{ label }}</div></div>
-            </div>
+    <div id="job-results-labels" class="LabelList JobResults-resultRowText JobResults-resultRowText--fullWidth">
+        <div ng-repeat="label in vm.labels.value" class="LabelList-tagContainer">
+            <div class="LabelList-tag"><div class="LabelList-name">{{ label }}</div></div>
         </div>
     </div>
 </div>
diff --git a/awx/ui/client/features/output/index.view.html b/awx/ui/client/features/output/index.view.html
index b3bb6e95bc..f25171f9f2 100644
--- a/awx/ui/client/features/output/index.view.html
+++ b/awx/ui/client/features/output/index.view.html
@@ -1,64 +1,62 @@
-<div class="container-fluid">
-    <div ui-view></div>
-    <div class="col-md-4" ng-show="!vm.fullscreen.isFullscreen">
-        <at-panel>
-            <at-job-details resource="vm.resource"></at-job-details>
-        </at-panel>
-    </div>
+<div ui-view></div>
+<div class="JobResults-container">
+    <at-panel ng-show="!vm.fullscreen.isFullscreen">
+        <at-job-details resource="vm.resource"></at-job-details>
+    </at-panel>
 
-    <div ng-class="vm.fullscreen.isFullscreen ? 'col-md-12' : 'col-md-8'">
-        <at-panel class="at-Stdout">
-            <div class="at-Panel-headingTitle">{{ vm.title }}</div>
-            <at-job-stats
-                resource="vm.resource"
-                fullscreen="vm.fullscreen">
-            </at-job-stats>
-            <at-job-search></at-job-search>
+    <at-panel class="at-Stdout" ng-class="{'at-Stdout--fullscreen': vm.fullscreen.isFullscreen}">
+        <div class="at-Panel-headingTitle">
+            {{ vm.title }}
+        </div>
+        <at-job-stats
+            resource="vm.resource"
+            fullscreen="vm.fullscreen">
+        </at-job-stats>
+        <at-job-search></at-job-search>
 
-            <div class="at-Stdout-menuTop">
-                <div class="pull-left" ng-click="vm.expand()">
-                    <i class="at-Stdout-menuIcon fa"
-                       ng-class="{ 'fa-minus': vm.isExpanded, 'fa-plus': !vm.isExpanded }"></i>
-                </div>
-
-                <div class="pull-right" ng-click="vm.scroll.end()">
-                    <i class="at-Stdout-menuIcon--lg fa fa-angle-double-down"
-                       ng-class=" { 'at-Stdout-menuIcon--active': vm.scroll.isLocked }"></i>
-                </div>
-                <div class="pull-right" ng-click="vm.scroll.home()">
-                    <i class="at-Stdout-menuIcon--lg fa fa-angle-double-up"></i>
-                </div>
-                <div class="pull-right" ng-click="vm.scroll.down()">
-                    <i class="at-Stdout-menuIcon--lg fa fa-angle-down"></i>
-                </div>
-                <div class="pull-right" ng-click="vm.scroll.up()">
-                    <i class="at-Stdout-menuIcon--lg fa fa-angle-up"></i>
-                </div>
-
-                <div class="at-u-clear"></div>
+        <div class="at-Stdout-menuTop">
+            <div class="pull-left" ng-click="vm.expand()">
+                <i class="at-Stdout-menuIcon fa"
+                    ng-class="{ 'fa-minus': vm.isExpanded, 'fa-plus': !vm.isExpanded }"></i>
             </div>
 
-            <pre class="at-Stdout-container">
-                <table>
-                    <thead>
-                        <tr>
-                            <th class="at-Stdout-toggle">&nbsp;</th>
-                            <th class="at-Stdout-line"></th>
-                            <th class="at-Stdout-event"></th>
-                        </tr>
-                    </thead>
-                    <tbody id="atStdoutResultTable"></tbody>
-                </table>
-            </pre>
-
-            <div ng-show="vm.scroll.showBackToTop" class="at-Stdout-menuBottom">
-                <div class="at-Stdout-menuIconGroup" ng-click="vm.scroll.home()">
-                    <p class="pull-left"><i class="fa fa-angle-double-up"></i></p>
-                    <p class="pull-right">Back to Top</p>
-                </div>
-
-                <div class="at-u-clear"></div>
+            <div class="pull-right" ng-click="vm.scroll.end()">
+                <i class="at-Stdout-menuIcon--lg fa fa-angle-double-down"
+                    ng-class=" { 'at-Stdout-menuIcon--active': vm.scroll.isLocked }"></i>
             </div>
-        </at-panel>
-    </div>
+            <div class="pull-right" ng-click="vm.scroll.home()">
+                <i class="at-Stdout-menuIcon--lg fa fa-angle-double-up"></i>
+            </div>
+            <div class="pull-right" ng-click="vm.scroll.down()">
+                <i class="at-Stdout-menuIcon--lg fa fa-angle-down"></i>
+            </div>
+            <div class="pull-right" ng-click="vm.scroll.up()">
+                <i class="at-Stdout-menuIcon--lg fa fa-angle-up"></i>
+            </div>
+
+            <div class="at-u-clear"></div>
+        </div>
+
+        <pre class="at-Stdout-container">
+            <table>
+                <thead>
+                    <tr>
+                        <th class="at-Stdout-toggle">&nbsp;</th>
+                        <th class="at-Stdout-line"></th>
+                        <th class="at-Stdout-event"></th>
+                    </tr>
+                </thead>
+                <tbody id="atStdoutResultTable"></tbody>
+            </table>
+        </pre>
+
+        <div ng-show="vm.scroll.showBackToTop" class="at-Stdout-menuBottom">
+            <div class="at-Stdout-menuIconGroup" ng-click="vm.scroll.home()">
+                <p class="pull-left"><i class="fa fa-angle-double-up"></i></p>
+                <p class="pull-right">Back to Top</p>
+            </div>
+
+            <div class="at-u-clear"></div>
+        </div>
+    </at-panel>
 </div>
diff --git a/awx/ui/client/features/output/stats.partial.html b/awx/ui/client/features/output/stats.partial.html
index 70d980ed33..6427735236 100644
--- a/awx/ui/client/features/output/stats.partial.html
+++ b/awx/ui/client/features/output/stats.partial.html
@@ -42,40 +42,47 @@
         ng-show="!vm.running"
         data-placement="top"
         aw-tool-tip="{{ vm.tooltips.ok }}"
-        data-tip-watch="vm.tooltips.ok">
+        data-tip-watch="vm.tooltips.ok"
+        tooltip-outer-class="HostStatusBar-tooltip">
     </div>
     <div class="HostStatusBar-skipped"
         ng-show="!vm.running"
         data-placement="top"
         aw-tool-tip="{{ vm.tooltips.skipped }}"
-        data-tip-watch="vm.tooltips.skipped">
+        data-tip-watch="vm.tooltips.skipped"
+        tooltip-outer-class="HostStatusBar-tooltip">
     </div>
     <div class="HostStatusBar-changed"
         ng-show="!vm.running"
         data-placement="top"
         aw-tool-tip="{{ vm.tooltips.changed }}"
-        data-tip-watch="vm.tooltips.changed">
+        data-tip-watch="vm.tooltips.changed"
+        tooltip-outer-class="HostStatusBar-tooltip">
     </div>
     <div class="HostStatusBar-failures"
         ng-show="!vm.running"
         data-placement="top"
         aw-tool-tip="{{ vm.tooltips.failures }}"
-        data-tip-watch="vm.tooltips.failures">
+        data-tip-watch="vm.tooltips.failures"
+        tooltip-outer-class="HostStatusBar-tooltip">
     </div>
     <div class="HostStatusBar-dark"
         ng-show="!vm.running"
         data-placement="top"
         aw-tool-tip="{{ vm.tooltips.dark }}"
-        data-tip-watch="vm.tooltips.dark">
+        data-tip-watch="vm.tooltips.dark"
+        tooltip-outer-class="HostStatusBar-tooltip">
     </div>
     <div class="HostStatusBar-noData"
         ng-show="vm.running"
         data-placement="top"
-        aw-tool-tip="{{:: vm.tooltips.running }}">
+        aw-tool-tip="{{:: vm.tooltips.running }}"
+        tooltip-outer-class="HostStatusBar-tooltip">
     </div>
     <div class="HostStatusBar-noData"
         ng-show="!vm.running && !vm.statsAreAvailable"
         data-placement="top"
-        aw-tool-tip="{{:: vm.tooltips.unavailable }}">
+        aw-tool-tip="{{:: vm.tooltips.unavailable }}"
+        tooltip-outer-class="HostStatusBar-tooltip">
     </div>
 </div>

From 6ab64590d745a601b69f7907ecd02be416fa3e39 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 27 Apr 2018 11:37:17 -0400
Subject: [PATCH 009/169] update app activity stream target to
 o_auth2_application

---
 awx/ui/client/features/applications/index.js             | 9 ++++-----
 .../src/activity-stream/get-target-title.factory.js      | 2 +-
 .../activity-stream/model-to-base-path-key.factory.js    | 2 +-
 .../streamDropdownNav/stream-dropdown-nav.directive.js   | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

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'},

From c8e416f0b7dd84fd1f42fa9cad013c14897d2fe9 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Fri, 27 Apr 2018 11:40:58 -0400
Subject: [PATCH 010/169] restore the celery hostname

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 14564df430..e7df5b3d48 100644
--- a/Makefile
+++ b/Makefile
@@ -323,7 +323,7 @@ celeryd:
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
 	fi; \
-	celery worker -A awx -l DEBUG -B -Ofair --autoscale=100,4 --schedule=$(CELERY_SCHEDULE_FILE) --pidfile /tmp/celery_pid
+	celery worker -A awx -l DEBUG -B -Ofair --autoscale=100,4 --schedule=$(CELERY_SCHEDULE_FILE) -n celery@$(COMPOSE_HOST) --pidfile /tmp/celery_pid
 
 # Run to start the zeromq callback receiver
 receiver:

From 11560ab7bbdcd28b7337d04be9254d0f4256cedb Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 27 Apr 2018 13:05:34 -0400
Subject: [PATCH 011/169] populate org and description on app detail view

---
 .../add-applications.controller.js            |  2 +-
 .../applications/applications.strings.js      |  4 +++
 .../edit-applications.controller.js           | 32 ++++++-------------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/awx/ui/client/features/applications/add-applications.controller.js b/awx/ui/client/features/applications/add-applications.controller.js
index 23453734fe..486c20dffb 100644
--- a/awx/ui/client/features/applications/add-applications.controller.js
+++ b/awx/ui/client/features/applications/add-applications.controller.js
@@ -42,7 +42,7 @@ function AddApplicationsController (models, $state, strings) {
     vm.form.organization._resource = 'organization';
     vm.form.organization._route = 'applications.add.organization';
     vm.form.organization._model = organization;
-    vm.form.organization._placeholder = strings.get('SELECT AN ORGANIZATION');
+    vm.form.organization._placeholder = strings.get('inputs.ORGANIZATION_PLACEHOLDER');
 
     vm.form.name.required = true;
     vm.form.organization.required = true;
diff --git a/awx/ui/client/features/applications/applications.strings.js b/awx/ui/client/features/applications/applications.strings.js
index 18158c4d4e..0194efbf42 100644
--- a/awx/ui/client/features/applications/applications.strings.js
+++ b/awx/ui/client/features/applications/applications.strings.js
@@ -25,6 +25,10 @@ function ApplicationsStrings (BaseString) {
         ROW_ITEM_LABEL_ORGANIZATION: t.s('ORG'),
         ROW_ITEM_LABEL_MODIFIED: t.s('LAST MODIFIED')
     };
+
+    ns.inputs = {
+        ORGANIZATION_PLACEHOLDER: t.s('SELECT AN ORGANIZATION')
+    };
 }
 
 ApplicationsStrings.$inject = ['BaseStringService'];
diff --git a/awx/ui/client/features/applications/edit-applications.controller.js b/awx/ui/client/features/applications/edit-applications.controller.js
index 6b7e21aed4..60b08be6ba 100644
--- a/awx/ui/client/features/applications/edit-applications.controller.js
+++ b/awx/ui/client/features/applications/edit-applications.controller.js
@@ -52,37 +52,25 @@ function EditApplicationsController (models, $state, strings, $scope) {
 
     vm.form.disabled = !isEditable;
 
+    vm.form.name.required = true;
+    vm.form.redirect_uris.required = true;
+
     const isOrgAdmin = _.some(me.get('related.admin_of_organizations.results'), (org) => org.id === organization.get('id'));
     const isSuperuser = me.get('is_superuser');
     const isCurrentAuthor = Boolean(application.get('summary_fields.created_by.id') === me.get('id'));
-
-    vm.form.organization = {
-        type: 'field',
-        label: 'Organization',
-        id: 'organization'
-    };
-    vm.form.description = {
-        type: 'String',
-        label: 'Description',
-        id: 'description'
-    };
-
-    vm.form.organization._resource = 'organization';
-    vm.form.organization._route = 'applications.edit.organization';
-    vm.form.organization._model = organization;
-    vm.form.organization._placeholder = strings.get('SELECT AN ORGANIZATION');
-
-    // TODO: org not returned via api endpoint, check on this
-    vm.form.organization._value = application.get('organization');
-
     vm.form.organization._disabled = true;
+
     if (isSuperuser || isOrgAdmin || (application.get('organization') === null && isCurrentAuthor)) {
         vm.form.organization._disabled = false;
     }
 
-    vm.form.name.required = true;
+    vm.form.organization._resource = 'organization';
+    vm.form.organization._model = organization;
+    vm.form.organization._route = 'applications.edit.organization';
+    vm.form.organization._value = application.get('summary_fields.organization.id');
+    vm.form.organization._displayValue = application.get('summary_fields.organization.name');
+    vm.form.organization._placeholder = strings.get('inputs.ORGANIZATION_PLACEHOLDER');
     vm.form.organization.required = true;
-    vm.form.redirect_uris.required = true;
 
     delete vm.form.name.help_text;
 

From f5c4f9a9dffe27bd2ce4d209c4a265f2fe1e9922 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Fri, 27 Apr 2018 11:15:20 -0700
Subject: [PATCH 012/169] Adds liveUpdates flag for the UI back in

This line was lost in the 3.2.4 merge
---
 awx/ui/client/index.template.ejs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/index.template.ejs b/awx/ui/client/index.template.ejs
index 58ee4d85a0..6f6a5c2cba 100644
--- a/awx/ui/client/index.template.ejs
+++ b/awx/ui/client/index.template.ejs
@@ -6,7 +6,10 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="shortcut icon" href="{{ STATIC_URL }}assets/favicon.ico?v={{version}}" />
-    <script>var $basePath = '{{ STATIC_URL }}'</script>
+    <script>
+        var $basePath = '{{ STATIC_URL }}';
+        window.liveUpdates = "{{ UI_LIVE_UPDATES_ENABLED }}" === "False" ? false : true;
+    </script>
     <% htmlWebpackPlugin.files.css.forEach(file => {%>
         <link href="{{ STATIC_URL }}<%= file %>" rel="stylesheet" />
     <% }) %>

From aa6fc6d8bfe7e5f45fa7721f3e74f70ff50bd220 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Fri, 27 Apr 2018 15:38:12 -0400
Subject: [PATCH 013/169] only show close icon in templates panel header when
 applicable

---
 .../features/templates/index.controller.js    |  4 ++--
 .../client/features/templates/index.view.html | 24 +++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/awx/ui/client/features/templates/index.controller.js b/awx/ui/client/features/templates/index.controller.js
index 5f305345a9..c859255070 100644
--- a/awx/ui/client/features/templates/index.controller.js
+++ b/awx/ui/client/features/templates/index.controller.js
@@ -11,9 +11,9 @@ function IndexTemplatesController ($scope, strings, dataset) {
 }
 
 IndexTemplatesController.$inject = [
-	'$scope',
+    '$scope',
     'TemplatesStrings',
-    'Dataset',
+    'Dataset'
 ];
 
 export default IndexTemplatesController;
diff --git a/awx/ui/client/features/templates/index.view.html b/awx/ui/client/features/templates/index.view.html
index 6323fd8129..5f6ae703f6 100644
--- a/awx/ui/client/features/templates/index.view.html
+++ b/awx/ui/client/features/templates/index.view.html
@@ -1,10 +1,20 @@
 <div ui-view="form"></div>
-<at-panel>
-    <at-panel-heading>
-        {{:: vm.strings.get('list.PANEL_TITLE') }}
-        <div class="at-Panel-headingTitleBadge" ng-show="vm.count">
-            {{ vm.count }}
-        </div>
-    </at-panel-heading>
+<at-panel ng-cloak id="htmlTemplate">
+    <div ng-if="$state.is('templates')">
+        <at-panel-heading hide-dismiss="true">
+            {{:: vm.strings.get('list.PANEL_TITLE') }}
+            <div class="at-Panel-headingTitleBadge" ng-show="vm.count">
+                {{ vm.count }}
+            </div>
+        </at-panel-heading>
+    </div>
+    <div ng-if="!$state.is('templates')">
+        <at-panel-heading>
+            {{:: vm.strings.get('list.PANEL_TITLE') }}
+            <div class="at-Panel-headingTitleBadge" ng-show="vm.count">
+                {{ vm.count }}
+            </div>
+        </at-panel-heading>
+    </div>
     <div ui-view="templatesList"></div>
 </at-panel>

From 10fd65bea0668b68738663e58a0505840710329a Mon Sep 17 00:00:00 2001
From: Ben Thomasson <bthomass@redhat.com>
Date: Mon, 30 Apr 2018 10:23:14 -0400
Subject: [PATCH 014/169] Fixes dragging devices out of the inventory toolbox

Fixes a defect where devices were dropped onto the canvas
if they were moved a small amount after being selected in
the inventory toolbox.   This fix checks that the mouse
has cleared the boundary of the inventory toolbox before
dropping it onto the canvas.
---
 awx/ui/client/src/network-ui/toolbox.fsm.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/network-ui/toolbox.fsm.js b/awx/ui/client/src/network-ui/toolbox.fsm.js
index c8a80c6463..562c38b167 100644
--- a/awx/ui/client/src/network-ui/toolbox.fsm.js
+++ b/awx/ui/client/src/network-ui/toolbox.fsm.js
@@ -234,8 +234,19 @@ _Start.prototype.start.transitions = ['Ready'];
 
 _Move.prototype.onMouseUp = function (controller) {
 
-    controller.changeState(Dropping);
+    var i = 0;
+    var toolbox = controller.toolbox;
 
+    if (controller.scope.mouseX <  controller.toolbox.width) {
+        for(i = 0; i < toolbox.items.length; i++) {
+            toolbox.items[i].selected = false;
+        }
+        toolbox.selected_item = null;
+        controller.changeState(Ready);
+
+    } else {
+        controller.changeState(Dropping);
+    }
 };
 _Move.prototype.onMouseUp.transitions = ['Dropping'];
 

From 456bf5d04d3e647e892f0351f93e2cde6cc513e2 Mon Sep 17 00:00:00 2001
From: Ben Thomasson <bthomass@redhat.com>
Date: Mon, 30 Apr 2018 10:40:30 -0400
Subject: [PATCH 015/169] Fixes scroll of devices over inventory toolbox title.

Fixes a defect where the devices in the inventory toolbox
would scroll over the toolbox title.   This moves the title
later in the rendering order and adds a background to the title.
---
 .../src/network-ui/inventory_toolbox.partial.svg     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/src/network-ui/inventory_toolbox.partial.svg b/awx/ui/client/src/network-ui/inventory_toolbox.partial.svg
index 7709b30228..88d4c67cfe 100644
--- a/awx/ui/client/src/network-ui/inventory_toolbox.partial.svg
+++ b/awx/ui/client/src/network-ui/inventory_toolbox.partial.svg
@@ -6,11 +6,7 @@
       ng-attr-width="{{toolbox.width}}"
       ng-attr-height="{{toolbox.height}}"
       rx=5></rect>
-<text
-    class="NetworkUI__toolbox--title"
-    ng-attr-transform="translate({{toolbox.title_coordinates.x}},{{toolbox.title_coordinates.y}})">
-        {{toolbox.name}}
-</text>
+
 
 <g clip-path="url(#inventory-toolbox-clip-path)">
 <g ng-attr-transform="translate({{toolbox.x}}, {{toolbox.y+20}})">
@@ -92,4 +88,10 @@
 </g> <!-- end selected item -->
 </g> <!-- ng-if -->
 </g> <!-- ng-if toolbox.enabled -->
+<text
+    class="NetworkUI__toolbox--title"
+    filter="url(#background)"
+    ng-attr-transform="translate({{toolbox.title_coordinates.x}},{{toolbox.title_coordinates.y}})">
+        {{toolbox.name}}
+</text>
 </g> <!-- ng-if !hide_menus -->

From 24e363888a89babd3faf798d375ed73fc32d9eee Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 30 Apr 2018 10:47:34 -0400
Subject: [PATCH 016/169] Fixed error showing vault password prompts on
 relaunch

---
 .../relaunchButton.component.js               | 11 +++-
 awx/ui/client/lib/models/Job.js               | 10 +++
 .../src/templates/prompt/prompt.controller.js | 66 +++++++++----------
 .../src/templates/prompt/prompt.partial.html  |  2 +-
 .../src/templates/prompt/prompt.service.js    |  4 +-
 .../prompt-credential.controller.js           | 16 ++---
 .../credential/prompt-credential.partial.html | 18 ++---
 7 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
index df97883dc4..aa29a2b700 100644
--- a/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
+++ b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
@@ -33,11 +33,12 @@ function atRelaunchCtrl (
             ) {
                 const jobPromises = [
                     jobObj.request('get', vm.job.id),
-                    jobTemplate.optionsLaunch(vm.job.unified_job_template)
+                    jobTemplate.optionsLaunch(vm.job.unified_job_template),
+                    jobObj.getCredentials(vm.job.id)
                 ];
 
                 $q.all(jobPromises)
-                    .then(([jobRes, launchOptions]) => {
+                    .then(([jobRes, launchOptions, jobCreds]) => {
                         const populatedJob = jobRes.data;
                         const jobTypeChoices = _.get(
                             launchOptions,
@@ -68,7 +69,11 @@ function atRelaunchCtrl (
                             relaunchHostType: option ? (option.name).toLowerCase() : null,
                             prompts: {
                                 credentials: {
-                                    value: populatedJob.summary_fields.credentials || []
+                                    value: populatedJob.summary_fields.credentials ?
+                                        _.merge(
+                                            jobCreds.data.results,
+                                            populatedJob.summary_fields.credentials
+                                        ) : []
                                 },
                                 variables: {
                                     value: populatedJob.extra_vars
diff --git a/awx/ui/client/lib/models/Job.js b/awx/ui/client/lib/models/Job.js
index 7dd58482a5..1e466b0e6d 100644
--- a/awx/ui/client/lib/models/Job.js
+++ b/awx/ui/client/lib/models/Job.js
@@ -48,6 +48,15 @@ function getStats () {
         });
 }
 
+function getCredentials (id) {
+    const req = {
+        method: 'GET',
+        url: `${this.path}${id}/credentials/`
+    };
+
+    return $http(req);
+}
+
 function JobModel (method, resource, config) {
     BaseModel.call(this, 'jobs');
 
@@ -56,6 +65,7 @@ function JobModel (method, resource, config) {
     this.postRelaunch = postRelaunch.bind(this);
     this.getRelaunch = getRelaunch.bind(this);
     this.getStats = getStats.bind(this);
+    this.getCredentials = getCredentials.bind(this);
 
     return this.create(method, resource, config);
 }
diff --git a/awx/ui/client/src/templates/prompt/prompt.controller.js b/awx/ui/client/src/templates/prompt/prompt.controller.js
index 6ea5c61aad..362e1223fe 100644
--- a/awx/ui/client/src/templates/prompt/prompt.controller.js
+++ b/awx/ui/client/src/templates/prompt/prompt.controller.js
@@ -56,10 +56,12 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel',
                     .then( (response) => {
                         vm.promptDataClone.prompts.credentials.credentialTypes = {};
                         vm.promptDataClone.prompts.credentials.credentialTypeOptions = [];
+                        let machineCredTypeId = null;
                         response.data.results.forEach((credentialTypeRow => {
                             vm.promptDataClone.prompts.credentials.credentialTypes[credentialTypeRow.id] = credentialTypeRow.kind;
                             if(credentialTypeRow.kind.match(/^(cloud|net|ssh|vault)$/)) {
                                 if(credentialTypeRow.kind === 'ssh') {
+                                    machineCredTypeId = credentialTypeRow.id;
                                     vm.promptDataClone.prompts.credentials.credentialKind = credentialTypeRow.id.toString();
                                 }
                                 vm.promptDataClone.prompts.credentials.credentialTypeOptions.push({
@@ -72,40 +74,33 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel',
                         vm.promptDataClone.prompts.credentials.passwords = {};
 
                         if(vm.promptDataClone.launchConf.passwords_needed_to_start) {
+                            let machineCredPassObj = null;
                             vm.promptDataClone.launchConf.passwords_needed_to_start.forEach((passwordNeeded) => {
-                                if (passwordNeeded === "ssh_password") {
-                                    vm.promptDataClone.prompts.credentials.value.forEach((defaultCredential) => {
-                                        defaultCredential.passwords_needed.forEach((neededPassword) => {
-                                            if (neededPassword === "ssh_password") {
-                                                vm.promptDataClone.prompts.credentials.passwords.ssh = {
+                                if (passwordNeeded === "ssh_password" ||
+                                    passwordNeeded === "become_password" ||
+                                    passwordNeeded === "ssh_key_unlock"
+                                ) {
+                                    if (!machineCredPassObj) {
+                                        vm.promptDataClone.prompts.credentials.value.forEach((defaultCredential) => {
+                                            if (defaultCredential.kind && defaultCredential.kind === "ssh") {
+                                                machineCredPassObj = {
                                                     id: defaultCredential.id,
                                                     name: defaultCredential.name
                                                 };
+                                            } else if (defaultCredential.passwords_needed) {
+                                                defaultCredential.passwords_needed.forEach((neededPassword) => {
+                                                    if (neededPassword === passwordNeeded) {
+                                                        machineCredPassObj = {
+                                                            id: defaultCredential.id,
+                                                            name: defaultCredential.name
+                                                        };
+                                                    }
+                                                });
                                             }
                                         });
-                                    });
-                                } else if (passwordNeeded === "become_password") {
-                                    vm.promptDataClone.prompts.credentials.value.forEach((defaultCredential) => {
-                                        defaultCredential.passwords_needed.forEach((neededPassword) => {
-                                            if (neededPassword === "become_password") {
-                                                vm.promptDataClone.prompts.credentials.passwords.become = {
-                                                    id: defaultCredential.id,
-                                                    name: defaultCredential.name
-                                                };
-                                            }
-                                        });
-                                    });
-                                } else if (passwordNeeded === "ssh_key_unlock") {
-                                    vm.promptDataClone.prompts.credentials.value.forEach((defaultCredential) => {
-                                        defaultCredential.passwords_needed.forEach((neededPassword) => {
-                                            if (neededPassword === "ssh_key_unlock") {
-                                                vm.promptDataClone.prompts.credentials.passwords.ssh_key_unlock = {
-                                                    id: defaultCredential.id,
-                                                    name: defaultCredential.name
-                                                };
-                                            }
-                                        });
-                                    });
+                                    }
+
+                                    vm.promptDataClone.prompts.credentials.passwords[passwordNeeded] = angular.copy(machineCredPassObj);
                                 } else if (passwordNeeded.startsWith("vault_password")) {
                                     let vault_id = null;
                                     if (passwordNeeded.includes('.')) {
@@ -119,12 +114,15 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel',
                                     // Loop across the default credentials to find the name of the
                                     // credential that requires a password
                                     vm.promptDataClone.prompts.credentials.value.forEach((defaultCredential) => {
-                                        if (defaultCredential.vault_id === vault_id) {
-                                            vm.promptDataClone.prompts.credentials.passwords.vault.push({
-                                                id: defaultCredential.id,
-                                                name: defaultCredential.name,
-                                                vault_id: defaultCredential.vault_id
-                                            });
+                                        if (vm.promptDataClone.prompts.credentials.credentialTypes[defaultCredential.credential_type] === "vault") {
+                                            let defaultCredVaultId = defaultCredential.vault_id || _.get(defaultCredential, 'inputs.vault_id') || null;
+                                            if (defaultCredVaultId === vault_id) {
+                                                vm.promptDataClone.prompts.credentials.passwords.vault.push({
+                                                    id: defaultCredential.id,
+                                                    name: defaultCredential.name,
+                                                    vault_id: defaultCredVaultId
+                                                });
+                                            }
                                         }
                                     });
                                 }
diff --git a/awx/ui/client/src/templates/prompt/prompt.partial.html b/awx/ui/client/src/templates/prompt/prompt.partial.html
index a25bef7e0b..79b23eedd8 100644
--- a/awx/ui/client/src/templates/prompt/prompt.partial.html
+++ b/awx/ui/client/src/templates/prompt/prompt.partial.html
@@ -34,7 +34,7 @@
             <button class="Prompt-actionButton"
                 ng-show="vm.steps.credential.tab._active"
                 ng-click="vm.next(vm.steps.credential.tab)"
-                ng-disabled="(preventCredsWithPasswords && (vm.promptDataClone.prompts.credentials.passwords.ssh || vm.promptDataClone.prompts.credentials.passwords.become || vm.promptDataClone.prompts.credentials.passwords.ssh_key_unlock || (vm.promptDataClone.prompts.credentials.passwords.vault && vm.promptDataClone.prompts.credentials.passwords.vault.length > 0))) ||
+                ng-disabled="(preventCredsWithPasswords && (vm.promptDataClone.prompts.credentials.passwords.ssh_password || vm.promptDataClone.prompts.credentials.passwords.become_password || vm.promptDataClone.prompts.credentials.passwords.ssh_key_unlock || (vm.promptDataClone.prompts.credentials.passwords.vault && vm.promptDataClone.prompts.credentials.passwords.vault.length > 0))) ||
                  !vm.forms.credentialPasswords.$valid ||
                  (vm.promptData.credentialTypeMissing && vm.promptData.credentialTypeMissing.length > 0)">{{:: vm.strings.get('NEXT') }}</button>
             <button class="Prompt-actionButton" ng-show="vm.steps.other_prompts.tab._active" ng-click="vm.next(vm.steps.other_prompts.tab)" ng-disabled="!vm.forms.otherPrompts.$valid">{{:: vm.strings.get('NEXT') }}</button>
diff --git a/awx/ui/client/src/templates/prompt/prompt.service.js b/awx/ui/client/src/templates/prompt/prompt.service.js
index 2044b7f440..f29e3ca856 100644
--- a/awx/ui/client/src/templates/prompt/prompt.service.js
+++ b/awx/ui/client/src/templates/prompt/prompt.service.js
@@ -171,7 +171,7 @@ function PromptService (Empty, $filter)  {
                 if (key === "ssh_key_unlock") {
                     launchData.credential_passwords.ssh_key_unlock = val.value;
                 } else if (key !== "vault") {
-                    launchData.credential_passwords[`${key}_password`] = val.value;
+                    launchData.credential_passwords[`${key}`] = val.value;
                 } else {
                     _.each(val, (vaultCred) => {
                         launchData.credential_passwords[vaultCred.vault_id ? `${key}_password.${vaultCred.vault_id}` : `${key}_password`] = vaultCred.value;
@@ -198,7 +198,7 @@ function PromptService (Empty, $filter)  {
                 if (key === "ssh_key_unlock") {
                     launchData.credential_passwords.ssh_key_unlock = val.value;
                 } else if (key !== "vault") {
-                    launchData.credential_passwords[`${key}_password`] = val.value;
+                    launchData.credential_passwords[`${key}`] = val.value;
                 } else {
                     _.each(val, (vaultCred) => {
                         launchData.credential_passwords[vaultCred.vault_id ? `${key}_password.${vaultCred.vault_id}` : `${key}_password`] = vaultCred.value;
diff --git a/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.controller.js b/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.controller.js
index 9a5c8feec3..f42792a822 100644
--- a/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.controller.js
+++ b/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.controller.js
@@ -35,9 +35,9 @@ export default
                 if(cred.passwords_needed) {
                     cred.passwords_needed.forEach((passwordNeeded => {
                         if(passwordNeeded === 'ssh_password') {
-                            delete scope.promptData.prompts.credentials.passwords.ssh;
+                            delete scope.promptData.prompts.credentials.passwords.ssh_password;
                         } else if(passwordNeeded === 'become_password') {
-                            delete scope.promptData.prompts.credentials.passwords.become;
+                            delete scope.promptData.prompts.credentials.passwords.become_password;
                         } else if(passwordNeeded === 'ssh_key_unlock') {
                             delete scope.promptData.prompts.credentials.passwords.ssh_key_unlock;
                         } else if(passwordNeeded.startsWith("vault_password")) {
@@ -50,10 +50,10 @@ export default
                     }));
                 } else if(cred.inputs && !_.isEmpty(cred.inputs)) {
                     if(cred.inputs.password && cred.inputs.password === "ASK") {
-                        delete scope.promptData.prompts.credentials.passwords.ssh;
+                        delete scope.promptData.prompts.credentials.passwords.ssh_password;
                     }
                     if(cred.inputs.become_password && cred.inputs.become_password === "ASK") {
-                        delete scope.promptData.prompts.credentials.passwords.become;
+                        delete scope.promptData.prompts.credentials.passwords.become_password;
                     }
                     if(cred.inputs.ssh_key_unlock && cred.inputs.ssh_key_unlock === "ASK") {
                         delete scope.promptData.prompts.credentials.passwords.ssh_key_unlock;
@@ -72,13 +72,13 @@ export default
             let updateNeededPasswords = (cred) => {
                 if(cred.inputs) {
                     if(cred.inputs.password && cred.inputs.password === "ASK") {
-                        scope.promptData.prompts.credentials.passwords.ssh = {
+                        scope.promptData.prompts.credentials.passwords.ssh_password = {
                             id: cred.id,
                             name: cred.name
                         };
                     }
                     if(cred.inputs.become_password && cred.inputs.become_password === "ASK") {
-                        scope.promptData.prompts.credentials.passwords.become = {
+                        scope.promptData.prompts.credentials.passwords.become_password = {
                             id: cred.id,
                             name: cred.name
                         };
@@ -291,10 +291,10 @@ export default
                             };
 
                             if(passwordNeeded === "ssh_password") {
-                                scope.promptData.prompts.credentials.passwords.ssh = credPassObj;
+                                scope.promptData.prompts.credentials.passwords.ssh_password = credPassObj;
                             }
                             if(passwordNeeded === "become_password") {
-                                scope.promptData.prompts.credentials.passwords.become = credPassObj;
+                                scope.promptData.prompts.credentials.passwords.become_password = credPassObj;
                             }
                             if(passwordNeeded === "ssh_key_unlock") {
                                 scope.promptData.prompts.credentials.passwords.ssh_key_unlock = credPassObj;
diff --git a/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.partial.html b/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.partial.html
index 214401b55f..7b1ca2b093 100644
--- a/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.partial.html
+++ b/awx/ui/client/src/templates/prompt/steps/credential/prompt-credential.partial.html
@@ -45,13 +45,13 @@
         </div>
     </div>
     <span>
-        <div ng-if="preventCredsWithPasswords && (promptData.prompts.credentials.passwords.ssh || promptData.prompts.credentials.passwords.become || promptData.prompts.credentials.passwords.ssh_key_unlock || (promptData.prompts.credentials.passwords.vault && promptData.prompts.credentials.passwords.vault.length > 0))">
+        <div ng-if="preventCredsWithPasswords && (promptData.prompts.credentials.passwords.ssh_password || promptData.prompts.credentials.passwords.become_password || promptData.prompts.credentials.passwords.ssh_key_unlock || (promptData.prompts.credentials.passwords.vault && promptData.prompts.credentials.passwords.vault.length > 0))">
             <div class="Prompt-credsWarning">
                 <span class="fa fa-warning"></span>
                 <span>{{ vm.strings.get('prompt.CREDENTIAL_PASSWORD_WARNING')}}</span>
             </div>
             <div class="Prompt-credsWarningList">
-                <div ng-if="promptData.prompts.credentials.passwords.ssh || promptData.prompts.credentials.passwords.become || promptData.prompts.credentials.passwords.ssh_key_unlock">{{promptData.prompts.credentials.passwords.ssh.name || promptData.prompts.credentials.passwords.become.name || promptData.prompts.credentials.passwords.ssh_key_unlock.name}}</div>
+                <div ng-if="promptData.prompts.credentials.passwords.ssh_password || promptData.prompts.credentials.passwords.become_password || promptData.prompts.credentials.passwords.ssh_key_unlock">{{promptData.prompts.credentials.passwords.ssh_password.name || promptData.prompts.credentials.passwords.become_password.name || promptData.prompts.credentials.passwords.ssh_key_unlock.name}}</div>
                 <div ng-if="promptData.prompts.credentials.passwords.vault && promptData.prompts.credentials.passwords.vault.length > 0" ng-repeat="vaultCred in promptData.prompts.credentials.passwords.vault">{{vaultCred.name}}</div>
             </div>
         </div>
@@ -65,10 +65,10 @@
         </div>
         <div id="prompt-credential"></div>
     </span>
-    <div ng-show="!preventCredsWithPasswords && (promptData.prompts.credentials.passwords.ssh || promptData.prompts.credentials.passwords.become || promptData.prompts.credentials.passwords.ssh_key_unlock || (promptData.prompts.credentials.passwords.vault && promptData.prompts.credentials.passwords.vault.length > 0))">
+    <div ng-show="!preventCredsWithPasswords && (promptData.prompts.credentials.passwords.ssh_password || promptData.prompts.credentials.passwords.become_password || promptData.prompts.credentials.passwords.ssh_key_unlock || (promptData.prompts.credentials.passwords.vault && promptData.prompts.credentials.passwords.vault.length > 0))">
         <div class="Prompt-instructions">{{:: vm.strings.get('prompt.PASSWORDS_REQUIRED_HELP') }}</div>
         <form name="credentialPasswordsForm" autocomplete="off" novalidate>
-            <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="promptData.prompts.credentials.passwords.ssh">
+            <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="promptData.prompts.credentials.passwords.ssh_password">
                 <label for="ssh_password" class="Form-inputLabelContainer">
                     <span class="Form-requiredAsterisk">*</span>
                     <span class="Form-inputLabel">{{:: vm.strings.get('prompt.credential_passwords.SSH_PASSWORD') }}</span>
@@ -77,7 +77,7 @@
                     <span class="input-group-btn">
                         <button type="button" class="btn btn-default show_input_button Prompt-passwordButton" id="prompt-ssh-password_show_input_button" aw-tool-tip="Toggle the display of plaintext." aw-tip-placement="top" ng-click="vm.togglePassword('#prompt-ssh-password')" data-container="job-launch-modal" data-original-title="" title="">{{:: vm.strings.get('SHOW') }}</button>
                     </span>
-                    <input id="prompt-ssh-password" type="password" ng-model="promptData.prompts.credentials.passwords.ssh.value" name="ssh_password" class="password-field form-control input-sm Form-textInput" required>
+                    <input id="prompt-ssh-password" type="password" ng-model="promptData.prompts.credentials.passwords.ssh_password.value" name="ssh_password" class="password-field form-control input-sm Form-textInput" required>
                 </div>
                 <div class="error" ng-show="credentialPasswordsForm.ssh_password.$dirty && credentialPasswordsForm.ssh_password.$error.required">{{:: vm.strings.get('prompt.PLEASE_ENTER_PASSWORD') }}</div>
                 <div class="error api-error" ng-bind="ssh_password_api_error"></div>
@@ -96,7 +96,7 @@
                 <div class="error" ng-show="credentialPasswordsForm.ssh_key_unlock.$dirty && credentialPasswordsForm.ssh_key_unlock.$error.required">{{:: vm.strings.get('prompt.PLEASE_ENTER_PASSWORD') }}</div>
                 <div class="error api-error" ng-bind="ssh_key_unlock_api_error"></div>
             </div>
-            <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="promptData.prompts.credentials.passwords.become">
+            <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="promptData.prompts.credentials.passwords.become_password">
                 <label for="become_password" class="Form-inputLabelContainer">
                     <span class="Form-requiredAsterisk">*</span>
                     <span class="Form-inputLabel">{{:: vm.strings.get('prompt.credential_passwords.PRIVILEGE_ESCALATION_PASSWORD') }}</span>
@@ -105,7 +105,7 @@
                     <span class="input-group-btn">
                         <button type="button" class="btn btn-default show_input_button Prompt-passwordButton" id="prompt-become-password_show_input_button" aw-tool-tip="Toggle the display of plaintext." aw-tip-placement="top" ng-click="vm.togglePassword('#prompt-become-password')" data-container="job-launch-modal" data-original-title="" title="">{{:: vm.strings.get('SHOW') }}</button>
                     </span>
-                    <input id="prompt-become-password" type="password" ng-model="promptData.prompts.credentials.passwords.become.value" name="become_password" class="password-field form-control input-sm Form-textInput" required>
+                    <input id="prompt-become-password" type="password" ng-model="promptData.prompts.credentials.passwords.become_password.value" name="become_password" class="password-field form-control input-sm Form-textInput" required>
                 </div>
                 <div class="error" ng-show="credentialPasswordsForm.become_password.$dirty && credentialPasswordsForm.become_password.$error.required">{{:: vm.strings.get('prompt.PLEASE_ENTER_PASSWORD') }}</div>
                 <div class="error api-error" ng-bind="become_password_api_error"></div>
@@ -118,9 +118,9 @@
                     </label>
                     <div class="input-group">
                         <span class="input-group-btn">
-                            <button type="button" class="btn btn-default show_input_button Prompt-passwordButton" id="prompt-vault-password_show_input_button" aw-tool-tip="Toggle the display of plaintext." aw-tip-placement="top" ng-click="vm.togglePassword('#prompt-vault-password')" data-container="job-launch-modal" data-original-title="" title="">{{:: vm.strings.get('SHOW') }}</button>
+                            <button type="button" class="btn btn-default show_input_button Prompt-passwordButton" ng-attr-id="{{ 'prompt-vault-password_show_input_button-' + $index }}" aw-tool-tip="Toggle the display of plaintext." aw-tip-placement="top" ng-click="vm.togglePassword('#prompt-vault-password')" data-container="job-launch-modal" data-original-title="" title="">{{:: vm.strings.get('SHOW') }}</button>
                         </span>
-                        <input id="prompt-vault-password" type="password" ng-model="promptData.prompts.credentials.passwords.vault[$index].value" name="vault_password" class="password-field form-control input-sm Form-textInput" required>
+                        <input ng-attr-id="{{ 'prompt-vault-password-' + $index }}" type="password" ng-model="promptData.prompts.credentials.passwords.vault[$index].value" name="vault_password" class="password-field form-control input-sm Form-textInput" required>
                     </div>
                     <div class="error" ng-show="credentialPasswordsForm.vault_password.$dirty && credentialPasswordsForm.vault_password.$error.required">{{:: vm.strings.get('prompt.PLEASE_ENTER_PASSWORD') }}</div>
                     <div class="error api-error" ng-bind="vault_password_api_error"></div>

From fd38c62e7e4288b640723861f1335f5f68085590 Mon Sep 17 00:00:00 2001
From: Ben Thomasson <bthomass@redhat.com>
Date: Mon, 30 Apr 2018 10:59:54 -0400
Subject: [PATCH 017/169] Fixes 301 redirects on topology websocket connection

Fixes 301 redirects on creation of the topology websocket
connection by adding a trailing slash to the websocket URI.
---
 awx/ui/client/src/network-ui/network.ui.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/network-ui/network.ui.controller.js b/awx/ui/client/src/network-ui/network.ui.controller.js
index a0875b0d64..a261b326bb 100644
--- a/awx/ui/client/src/network-ui/network.ui.controller.js
+++ b/awx/ui/client/src/network-ui/network.ui.controller.js
@@ -52,7 +52,7 @@ var NetworkUIController = function($scope,
 
   $scope.initial_messages = [];
   if (!$scope.disconnected) {
-      $scope.control_socket = new ReconnectingWebSocket(protocol + "://" + window.location.host + "/network_ui/topology?inventory_id=" + $scope.inventory_id,
+      $scope.control_socket = new ReconnectingWebSocket(protocol + "://" + window.location.host + "/network_ui/topology/?inventory_id=" + $scope.inventory_id,
                                                          null,
                                                          {debug: false, reconnectInterval: 300});
       if ($scope.tests_enabled) {

From fcc5549ec999b1f718abe507df34e6c8f518de37 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 30 Apr 2018 11:41:26 -0400
Subject: [PATCH 018/169] Reload state after copying inventory to update list

---
 .../inventories/list/inventory-list.controller.js        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js
index 9f3ba01557..9fc16afdd0 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/list/inventory-list.controller.js
@@ -77,7 +77,7 @@ function InventoriesList($scope,
         Wait('start');
         new Inventory('get', inventory.id)
             .then(model => model.copy())
-            .then(copy => $scope.editInventory(copy))
+            .then(copy => $scope.editInventory(copy, true))
             .catch(({ data, status }) => {
                 const params = { hdr: 'Error!', msg: `Call to copy failed. Return status: ${status}` };
                 ProcessErrors($scope, data, status, null, params);
@@ -89,12 +89,13 @@ function InventoriesList($scope,
          $state.go('inventories.edit.networking', {inventory_id: inventory.id, inventory_name: inventory.name});
     };
 
-    $scope.editInventory = function (inventory) {
+    $scope.editInventory = function (inventory, reload) {
+        const goOptions = reload ? { reload: true } : null;
         if(inventory.kind && inventory.kind === 'smart') {
-            $state.go('inventories.editSmartInventory', {smartinventory_id: inventory.id});
+            $state.go('inventories.editSmartInventory', {smartinventory_id: inventory.id}, goOptions);
         }
         else {
-            $state.go('inventories.edit', {inventory_id: inventory.id});
+            $state.go('inventories.edit', {inventory_id: inventory.id}, goOptions);
         }
     };
 

From 4197a9fd35f64db4d249feabfe2c930481c97c7a Mon Sep 17 00:00:00 2001
From: adamscmRH <chadams@redhat.com>
Date: Fri, 27 Apr 2018 16:39:37 -0400
Subject: [PATCH 019/169] granularly prevent filtering oauth secrets

---
 awx/api/filters.py                      | 2 --
 awx/main/models/__init__.py             | 6 ++++++
 awx/main/tests/unit/api/test_filters.py | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/awx/api/filters.py b/awx/api/filters.py
index c7425f5e75..81290c377b 100644
--- a/awx/api/filters.py
+++ b/awx/api/filters.py
@@ -121,8 +121,6 @@ def get_field_from_path(model, path):
                 new_parts.append(name_alt)
             else:
                 field = model._meta.get_field(name)
-            if 'auth' in name or 'token' in name:
-                raise PermissionDenied(_('Filtering on %s is not allowed.' % name))
             if isinstance(field, ForeignObjectRel) and getattr(field.field, '__prevent_search__', False):
                 raise PermissionDenied(_('Filtering on %s is not allowed.' % name))
             elif getattr(field, '__prevent_search__', False):
diff --git a/awx/main/models/__init__.py b/awx/main/models/__init__.py
index 0bbbc08254..7764655419 100644
--- a/awx/main/models/__init__.py
+++ b/awx/main/models/__init__.py
@@ -169,3 +169,9 @@ activity_stream_registrar.connect(OAuth2AccessToken)
 
 # prevent API filtering on certain Django-supplied sensitive fields
 prevent_search(User._meta.get_field('password'))
+prevent_search(OAuth2AccessToken._meta.get_field('token'))
+prevent_search(RefreshToken._meta.get_field('token'))
+prevent_search(OAuth2Application._meta.get_field('client_secret'))
+prevent_search(OAuth2Application._meta.get_field('client_id'))
+prevent_search(Grant._meta.get_field('code'))
+
diff --git a/awx/main/tests/unit/api/test_filters.py b/awx/main/tests/unit/api/test_filters.py
index 1a70b9716c..cc53234e97 100644
--- a/awx/main/tests/unit/api/test_filters.py
+++ b/awx/main/tests/unit/api/test_filters.py
@@ -10,6 +10,7 @@ from awx.main.models import (AdHocCommand, ActivityStream,
                              WorkflowJob, WorkflowJobTemplate,
                              WorkflowJobOptions, InventorySource,
                              JobEvent)
+from awx.main.models.oauth import OAuth2Application
 from awx.main.models.jobs import JobOptions
 
 # Django
@@ -82,7 +83,6 @@ def test_filter_on_password_field(password_field, lookup_suffix):
     (User, 'password__icontains'),
     (User, 'settings__value__icontains'),
     (User, 'main_oauth2accesstoken__token__gt'),
-    (User, 'main_oauth2application__name__gt'),
     (UnifiedJob, 'job_args__icontains'),
     (UnifiedJob, 'job_env__icontains'),
     (UnifiedJob, 'start_args__icontains'),
@@ -95,8 +95,8 @@ def test_filter_on_password_field(password_field, lookup_suffix):
     (JobTemplate, 'survey_spec__icontains'),
     (WorkflowJobTemplate, 'survey_spec__icontains'),
     (CustomInventoryScript, 'script__icontains'),
-    (ActivityStream, 'o_auth2_access_token__gt'),
-    (ActivityStream, 'o_auth2_application__gt')
+    (ActivityStream, 'o_auth2_application__client_secret__gt'),
+    (OAuth2Application, 'grant__code__gt')
 ])
 def test_filter_sensitive_fields_and_relations(model, query):
     field_lookup = FieldLookupBackend()

From f8a9402d4b3d2bd36b5486ea5af15a369395d5ed Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 30 Apr 2018 11:55:54 -0400
Subject: [PATCH 020/169] Fixed team list org sorting

---
 awx/ui/client/src/teams/list/teams-list.controller.js | 3 ---
 awx/ui/client/src/teams/teams.list.js                 | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/awx/ui/client/src/teams/list/teams-list.controller.js b/awx/ui/client/src/teams/list/teams-list.controller.js
index 254629d30b..024f74361b 100644
--- a/awx/ui/client/src/teams/list/teams-list.controller.js
+++ b/awx/ui/client/src/teams/list/teams-list.controller.js
@@ -28,9 +28,6 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt',
             $scope.list = list;
             $scope[`${list.iterator}_dataset`] = Dataset.data;
             $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
-            _.forEach($scope[list.name], (team) => {
-                team.organization_name = team.summary_fields.organization.name;
-            });
 
             $scope.selected = [];
         }
diff --git a/awx/ui/client/src/teams/teams.list.js b/awx/ui/client/src/teams/teams.list.js
index 1af52a8084..e1d9c5af35 100644
--- a/awx/ui/client/src/teams/teams.list.js
+++ b/awx/ui/client/src/teams/teams.list.js
@@ -28,7 +28,7 @@ export default ['i18n', function(i18n) {
             },
             organization: {
                 label: i18n._('Organization'),
-                ngBind: 'team.organization_name',
+                ngBind: 'team.summary_fields.organization.name',
                 sourceModel: 'organization',
                 sourceField: 'name',
                 columnClass: 'col-md-3 hidden-sm hidden-xs',

From e45be8155ea9664416ea120a14d89137670d1658 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 30 Apr 2018 14:56:17 -0400
Subject: [PATCH 021/169] Clear invalid password error if password field is
 completely cleared

---
 awx/ui/client/src/users/add/users-add.controller.js   | 7 ++++---
 awx/ui/client/src/users/edit/users-edit.controller.js | 7 ++++---
 awx/ui/client/src/users/users.form.js                 | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/awx/ui/client/src/users/add/users-add.controller.js b/awx/ui/client/src/users/add/users-add.controller.js
index 081ae21a90..c822b7bf9d 100644
--- a/awx/ui/client/src/users/add/users-add.controller.js
+++ b/awx/ui/client/src/users/add/users-add.controller.js
@@ -109,10 +109,11 @@ export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest',
         };
 
         // Password change
-        $scope.clearPWConfirm = function(fld) {
+        $scope.clearPWConfirm = function() {
             // If password value changes, make sure password_confirm must be re-entered
-            $scope[fld] = '';
-            $scope[form.name + '_form'][fld].$setValidity('awpassmatch', false);
+            $scope.password_confirm = '';
+            let passValidity = (!$scope.password || $scope.password === '') ? true : false;
+            $scope[form.name + '_form'].password_confirm.$setValidity('awpassmatch', passValidity);
         };
     }
 ];
diff --git a/awx/ui/client/src/users/edit/users-edit.controller.js b/awx/ui/client/src/users/edit/users-edit.controller.js
index 82ae48af1d..f2294a1703 100644
--- a/awx/ui/client/src/users/edit/users-edit.controller.js
+++ b/awx/ui/client/src/users/edit/users-edit.controller.js
@@ -189,10 +189,11 @@ export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest',
             }
         };
 
-        $scope.clearPWConfirm = function(fld) {
+        $scope.clearPWConfirm = function() {
             // If password value changes, make sure password_confirm must be re-entered
-            $scope[fld] = '';
-            $scope[form.name + '_form'][fld].$setValidity('awpassmatch', false);
+            $scope.password_confirm = '';
+            let passValidity = (!$scope.password || $scope.password === '') ? true : false;
+            $scope[form.name + '_form'].password_confirm.$setValidity('awpassmatch', passValidity);
             $rootScope.flashMessage = null;
         };
     }
diff --git a/awx/ui/client/src/users/users.form.js b/awx/ui/client/src/users/users.form.js
index 93a1264edd..900e1995ef 100644
--- a/awx/ui/client/src/users/users.form.js
+++ b/awx/ui/client/src/users/users.form.js
@@ -76,7 +76,7 @@ export default ['i18n', function(i18n) {
                         reqExpression: "isAddForm",
                         init: false
                     },
-                    ngChange: "clearPWConfirm('password_confirm')",
+                    ngChange: "clearPWConfirm()",
                     autocomplete: false,
                     ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },

From 421293c8c5bf6ca15233f766f89a4dd430bb932b Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Mon, 30 Apr 2018 15:11:34 -0700
Subject: [PATCH 022/169] fixes error handling with groups service, sources
 service

---
 .../inventories/related/groups/add/groups-add.controller.js | 4 ++--
 .../nested-groups/group-nested-groups-add.controller.js     | 4 ++--
 .../inventories/related/sources/sources.service.js          | 6 +++---
 .../client/src/inventories-hosts/shared/groups.service.js   | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.controller.js
index 9ede17bcf5..80a1d917b7 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.controller.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/add/groups-add.controller.js
@@ -49,10 +49,10 @@ export default ['$state', '$stateParams', '$scope', 'GroupForm',
             };
 
             GroupsService.post(group).then(res => {
-                if ($stateParams.group_id) {
+                if ($stateParams.group_id && _.has(res, 'data')) {
                     return GroupsService.associateGroup(res.data, $stateParams.group_id)
                         .then(() => $state.go('^', null, { reload: true }));
-                } else {
+                } else if(_.has(res, 'data.id')){
                     $state.go('^.edit', { group_id: res.data.id }, { reload: true });
                 }
             });
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.controller.js
index de61ced6b3..25633199bd 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.controller.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-add.controller.js
@@ -45,10 +45,10 @@ export default ['$state', '$stateParams', '$scope', 'NestedGroupForm',
             };
 
             GroupsService.post(group).then(res => {
-                if ($stateParams.group_id) {
+                if ($stateParams.group_id && _.has(res, 'data')) {
                     return GroupsService.associateGroup(res.data, $stateParams.group_id)
                         .then(() => $state.go('^', null, { reload: true }));
-                } else {
+                } else if(_.has(res, 'data.id')){
                     $state.go('^.edit', { group_id: res.data.id }, { reload: true });
                 }
             });
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js
index 8ac9b39248..ce65a7dae5 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.service.js
@@ -10,9 +10,9 @@ export default
         url: function(){
             return '';
         },
-        error: function(data, status) {
-            ProcessErrors($rootScope, data, status, null, { hdr: 'Error!',
-            msg: 'Call to ' + this.url + '. GET returned: ' + status });
+        error: function(data) {
+            ProcessErrors($rootScope, data.data, data.status, null, { hdr: 'Error!',
+            msg: 'Call to ' + this.url + '. GET returned: ' + data.status });
         },
         success: function(data){
             return data;
diff --git a/awx/ui/client/src/inventories-hosts/shared/groups.service.js b/awx/ui/client/src/inventories-hosts/shared/groups.service.js
index caf31eca2f..0c6e1f8bef 100644
--- a/awx/ui/client/src/inventories-hosts/shared/groups.service.js
+++ b/awx/ui/client/src/inventories-hosts/shared/groups.service.js
@@ -10,9 +10,9 @@ export default
             url: function(){
                 return '';
             },
-            error: function(data, status) {
-                ProcessErrors($rootScope, data, status, null, { hdr: 'Error!',
-                msg: 'Call to ' + this.url + '. GET returned: ' + status });
+            error: function(data) {
+                ProcessErrors($rootScope, data.data, data.status, null, { hdr: 'Error!',
+                msg: 'Call to ' + this.url + '. GET returned: ' + data.status });
             },
             success: function(data){
                 return data;

From 5ef297aec17cca3e964ead2a60a954a1416ac1ec Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 1 May 2018 12:13:16 -0400
Subject: [PATCH 023/169] Update relaunch button on details page in real time
 as status changes

---
 .../features/output/details.directive.js      |  8 +++-
 .../relaunchButton.component.js               | 38 +++++++++----------
 .../relaunchButton.partial.html               |  5 ++-
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/awx/ui/client/features/output/details.directive.js b/awx/ui/client/features/output/details.directive.js
index b19475f70a..d4e590e1c3 100644
--- a/awx/ui/client/features/output/details.directive.js
+++ b/awx/ui/client/features/output/details.directive.js
@@ -556,7 +556,7 @@ function AtJobDetailsController (
         vm.labels = getLabelDetails();
 
         // Relaunch and Delete Components
-        vm.job = _.get(resource.model, 'model.GET', {});
+        vm.job = angular.copy(_.get(resource.model, 'model.GET', {}));
         vm.canDelete = resource.model.get('summary_fields.user_capabilities.delete');
 
         vm.cancelJob = cancelJob;
@@ -568,10 +568,14 @@ function AtJobDetailsController (
         };
 
         observe(status.getStarted, getStartDetails, 'started');
-        observe(status.getJobStatus, getStatusDetails, 'status');
         observe(status.getFinished, getFinishDetails, 'finished');
         observe(status.getProjectUpdateId, getProjectUpdateDetails, 'projectUpdate');
         observe(status.getProjectStatus, getProjectStatusDetails, 'projectStatus');
+
+        $scope.$watch(status.getJobStatus, jobStatus => {
+            vm.status = getStatusDetails(jobStatus);
+            vm.job.status = jobStatus;
+        });
     };
 }
 
diff --git a/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
index df97883dc4..1f258a94ba 100644
--- a/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
+++ b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
@@ -23,6 +23,14 @@ function atRelaunchCtrl (
     const jobObj = new Job();
     const jobTemplate = new JobTemplate();
 
+    const updateTooltip = () => {
+        if (vm.job.type === 'job' && vm.job.status === 'failed') {
+            vm.tooltip = strings.get('relaunch.HOSTS');
+        } else {
+            vm.tooltip = strings.get('relaunch.DEFAULT');
+        }
+    };
+
     const checkRelaunchPlaybook = (option) => {
         jobObj.getRelaunch({
             id: vm.job.id
@@ -113,7 +121,7 @@ function atRelaunchCtrl (
 
                 jobObj.postRelaunch(launchParams)
                     .then((launchRes) => {
-                        if (!$state.includes('jobs')) {
+                        if (!$state.is('jobs')) {
                             const relaunchType = launchRes.data.type === 'job' ? 'playbook' : launchRes.data.type;
                             $state.go('jobz', { id: launchRes.data.id, type: relaunchType }, { reload: true });
                         }
@@ -129,13 +137,7 @@ function atRelaunchCtrl (
 
     vm.$onInit = () => {
         vm.showRelaunch = vm.job.type !== 'system_job' && vm.job.summary_fields.user_capabilities.start;
-        vm.showDropdown = vm.job.type === 'job' && vm.job.status === 'failed';
 
-        vm.createDropdown();
-        vm.createTooltips();
-    };
-
-    vm.createDropdown = () => {
         vm.icon = 'icon-launch';
         vm.dropdownTitle = strings.get('relaunch.DROPDOWN_TITLE');
         vm.dropdownOptions = [
@@ -148,14 +150,12 @@ function atRelaunchCtrl (
                 icon: 'icon-host-failed'
             }
         ];
-    };
 
-    vm.createTooltips = () => {
-        if (vm.showDropdown) {
-            vm.tooltip = strings.get('relaunch.HOSTS');
-        } else {
-            vm.tooltip = strings.get('relaunch.DEFAULT');
-        }
+        updateTooltip();
+
+        $scope.$watch('vm.job.status', () => {
+            updateTooltip();
+        });
     };
 
     vm.relaunchJob = () => {
@@ -167,7 +167,7 @@ function atRelaunchCtrl (
                     if (getUpdateRes.data.can_update) {
                         inventorySource.postUpdate(vm.job.inventory_source)
                             .then((postUpdateRes) => {
-                                if (!$state.includes('jobs')) {
+                                if (!$state.is('jobs')) {
                                     $state.go('jobz', { id: postUpdateRes.data.id, type: 'inventory' }, { reload: true });
                                 }
                             }).catch(({ data, status, config }) => {
@@ -191,7 +191,7 @@ function atRelaunchCtrl (
                     if (getUpdateRes.data.can_update) {
                         project.postUpdate(vm.job.project)
                             .then((postUpdateRes) => {
-                                if (!$state.includes('jobs')) {
+                                if (!$state.is('jobs')) {
                                     $state.go('jobz', { id: postUpdateRes.data.id, type: 'project' }, { reload: true });
                                 }
                             }).catch(({ data, status, config }) => {
@@ -213,7 +213,7 @@ function atRelaunchCtrl (
             workflowJob.postRelaunch({
                 id: vm.job.id
             }).then((launchRes) => {
-                if (!$state.includes('jobs')) {
+                if (!$state.is('jobs')) {
                     $state.go('workflowResults', { id: launchRes.data.id }, { reload: true });
                 }
             }).catch(({ data, status, config }) => {
@@ -237,7 +237,7 @@ function atRelaunchCtrl (
                     adHocCommand.postRelaunch({
                         id: vm.job.id
                     }).then((launchRes) => {
-                        if (!$state.includes('jobs')) {
+                        if (!$state.is('jobs')) {
                             $state.go('jobz', { id: launchRes.data.id, type: 'command' }, { reload: true });
                         }
                     }).catch(({ data, status, config }) => {
@@ -262,7 +262,7 @@ function atRelaunchCtrl (
             id: vm.promptData.job,
             relaunchData: PromptService.bundlePromptDataForRelaunch(vm.promptData)
         }).then((launchRes) => {
-            if (!$state.includes('jobs')) {
+            if (!$state.is('jobs')) {
                 $state.go('jobz', { id: launchRes.data.job, type: 'playbook' }, { reload: true });
             }
         }).catch(({ data, status }) => {
diff --git a/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html b/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html
index 280380dcbc..22f7120152 100644
--- a/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html
+++ b/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html
@@ -1,9 +1,10 @@
 <div ng-if="vm.showRelaunch"
     class="at-Relaunch"
     aw-tool-tip="{{ vm.tooltip }}"
+    data-tip-watch="vm.tooltip"
     data-placement="top">
 
-    <div class="btn-group" role="group" ng-if="vm.showDropdown">
+    <div class="btn-group" role="group" ng-if="vm.job.type === 'job' && vm.job.status === 'failed'">
         <button class="at-Relaunch--button"
             data-toggle="dropdown"
             aria-expanded="false"
@@ -27,7 +28,7 @@
 
     <button class="at-Relaunch--button"
             ng-click="vm.relaunchJob()"
-            ng-if="!vm.showDropdown">
+            ng-if="!(vm.job.type === 'job' && vm.job.status === 'failed')">
             <i class="{{ vm.icon }}"></i>
     </button>
     <prompt prompt-data="vm.promptData" on-finish="vm.relaunchJobWithPassword()"></prompt>

From 648d9165ff7491bc03a5ba023d27b82a74ac16d7 Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Mon, 30 Apr 2018 15:18:05 -0400
Subject: [PATCH 024/169] broadcast queues get a per-node stable queue name

* Using Kombu's default Broadcast() constructor requires only 1
parameter. That parameter defines the exchange name and the queue name
is randomly generated per-node.
* This caused problems if/when celery enters an infinite restart loop
because too many rabbit queues get created and rabbit OOM's
(gracefully).
* To remedy this we tell Broadcast the queue name to use, which is
derived from some constant + the node name so that the per-node queue
name is stable.
---
 awx/main/tasks.py                    |  4 ++--
 awx/main/tests/unit/utils/test_ha.py | 29 ++++++++++++++++------------
 awx/main/utils/ha.py                 | 28 +++++++++++++++++++--------
 awx/settings/defaults.py             |  6 +-----
 4 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 31edcc38d7..ea3c187d05 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -189,7 +189,7 @@ def apply_cluster_membership_policies(self):
         handle_ha_toplogy_changes.apply([])
 
 
-@shared_task(queue='tower_broadcast_all', bind=True)
+@shared_task(exchange='tower_broadcast_all', bind=True)
 def handle_setting_changes(self, setting_keys):
     orig_len = len(setting_keys)
     for i in range(orig_len):
@@ -208,7 +208,7 @@ def handle_setting_changes(self, setting_keys):
             restart_local_services(['uwsgi'])
 
 
-@shared_task(bind=True, queue='tower_broadcast_all')
+@shared_task(bind=True, exchange='tower_broadcast_all')
 def handle_ha_toplogy_changes(self):
     (changed, instance) = Instance.objects.get_or_register()
     if changed:
diff --git a/awx/main/tests/unit/utils/test_ha.py b/awx/main/tests/unit/utils/test_ha.py
index edd44b7958..6432be7a32 100644
--- a/awx/main/tests/unit/utils/test_ha.py
+++ b/awx/main/tests/unit/utils/test_ha.py
@@ -6,6 +6,7 @@
 # python
 import pytest
 import mock
+from contextlib import nested
 
 # AWX
 from awx.main.utils.ha import (
@@ -47,22 +48,26 @@ class TestAddRemoveCeleryWorkerQueues():
         app.control.cancel_consumer = mocker.MagicMock()
         return app
 
-    @pytest.mark.parametrize("static_queues,_worker_queues,groups,hostname,added_expected,removed_expected", [
-        (['east', 'west'], ['east', 'west', 'east-1'], [], 'east-1', [], []),
-        ([], ['east', 'west', 'east-1'], ['east', 'west'], 'east-1', [], []),
-        ([], ['east', 'west'], ['east', 'west'], 'east-1', ['east-1'], []),
-        ([], [], ['east', 'west'], 'east-1', ['east', 'west', 'east-1'], []),
-        ([], ['china', 'russia'], ['east', 'west'], 'east-1', ['east', 'west', 'east-1'], ['china', 'russia']),
+    @pytest.mark.parametrize("broadcast_queues,static_queues,_worker_queues,groups,hostname,added_expected,removed_expected", [
+        (['tower_broadcast_all'], ['east', 'west'], ['east', 'west', 'east-1'], [], 'east-1', ['tower_broadcast_all_east-1'], []),
+        ([], [], ['east', 'west', 'east-1'], ['east', 'west'], 'east-1', [], []),
+        ([], [], ['east', 'west'], ['east', 'west'], 'east-1', ['east-1'], []),
+        ([], [], [], ['east', 'west'], 'east-1', ['east', 'west', 'east-1'], []),
+        ([], [], ['china', 'russia'], ['east', 'west'], 'east-1', ['east', 'west', 'east-1'], ['china', 'russia']),
     ])
     def test__add_remove_celery_worker_queues_noop(self, mock_app,
-                                                   instance_generator, 
-                                                   worker_queues_generator, 
-                                                   static_queues, _worker_queues, 
+                                                   instance_generator,
+                                                   worker_queues_generator,
+                                                   broadcast_queues,
+                                                   static_queues, _worker_queues,
                                                    groups, hostname,
                                                    added_expected, removed_expected):
         instance = instance_generator(groups=groups, hostname=hostname)
         worker_queues = worker_queues_generator(_worker_queues)
-        with mock.patch('awx.main.utils.ha.settings.AWX_CELERY_QUEUES_STATIC', static_queues):
+        with nested(
+                mock.patch('awx.main.utils.ha.settings.AWX_CELERY_QUEUES_STATIC', static_queues),
+                mock.patch('awx.main.utils.ha.settings.AWX_CELERY_BCAST_QUEUES_STATIC', broadcast_queues),
+                mock.patch('awx.main.utils.ha.settings.CLUSTER_HOST_ID', hostname)):
             (added_queues, removed_queues) = _add_remove_celery_worker_queues(mock_app, [instance], worker_queues, hostname)
             assert set(added_queues) == set(added_expected)
             assert set(removed_queues) == set(removed_expected)
@@ -71,11 +76,11 @@ class TestAddRemoveCeleryWorkerQueues():
 class TestUpdateCeleryWorkerRoutes():
 
     @pytest.mark.parametrize("is_controller,expected_routes", [
-        (False, { 
+        (False, {
             'awx.main.tasks.cluster_node_heartbeat': {'queue': 'east-1', 'routing_key': 'east-1'},
             'awx.main.tasks.purge_old_stdout_files': {'queue': 'east-1', 'routing_key': 'east-1'}
         }),
-        (True, { 
+        (True, {
             'awx.main.tasks.cluster_node_heartbeat': {'queue': 'east-1', 'routing_key': 'east-1'},
             'awx.main.tasks.purge_old_stdout_files': {'queue': 'east-1', 'routing_key': 'east-1'},
             'awx.main.tasks.awx_isolated_heartbeat': {'queue': 'east-1', 'routing_key': 'east-1'},
diff --git a/awx/main/utils/ha.py b/awx/main/utils/ha.py
index 93a7f8dd24..1e3bee15fd 100644
--- a/awx/main/utils/ha.py
+++ b/awx/main/utils/ha.py
@@ -10,6 +10,10 @@ from django.conf import settings
 from awx.main.models import Instance
 
 
+def construct_bcast_queue_name(common_name):
+    return common_name.encode('utf8') + '_' + settings.CLUSTER_HOST_ID
+
+
 def _add_remove_celery_worker_queues(app, controlled_instances, worker_queues, worker_name):
     removed_queues = []
     added_queues = []
@@ -19,17 +23,14 @@ def _add_remove_celery_worker_queues(app, controlled_instances, worker_queues, w
         ig_names.update(instance.rampart_groups.values_list('name', flat=True))
     worker_queue_names = set([q['name'] for q in worker_queues])
 
+    bcast_queue_names = set([construct_bcast_queue_name(n) for n in settings.AWX_CELERY_BCAST_QUEUES_STATIC])
     all_queue_names = ig_names | hostnames | set(settings.AWX_CELERY_QUEUES_STATIC)
 
     # Remove queues that aren't in the instance group
-    for queue in worker_queues:
-        if queue['name'] in settings.AWX_CELERY_QUEUES_STATIC or \
-                queue['alias'] in settings.AWX_CELERY_BCAST_QUEUES_STATIC:
-            continue
-
-        if queue['name'] not in all_queue_names or not instance.enabled:
-            app.control.cancel_consumer(queue['name'].encode("utf8"), reply=True, destination=[worker_name])
-            removed_queues.append(queue['name'].encode("utf8"))
+    for queue_name in worker_queue_names:
+        if queue_name not in all_queue_names | bcast_queue_names or not instance.enabled:
+            app.control.cancel_consumer(queue_name.encode("utf8"), reply=True, destination=[worker_name])
+            removed_queues.append(queue_name.encode("utf8"))
 
     # Add queues for instance and instance groups
     for queue_name in all_queue_names:
@@ -37,6 +38,17 @@ def _add_remove_celery_worker_queues(app, controlled_instances, worker_queues, w
             app.control.add_consumer(queue_name.encode("utf8"), reply=True, destination=[worker_name])
             added_queues.append(queue_name.encode("utf8"))
 
+    # Add stable-named broadcast queues
+    for queue_name in settings.AWX_CELERY_BCAST_QUEUES_STATIC:
+        bcast_queue_name = construct_bcast_queue_name(queue_name)
+        if bcast_queue_name not in worker_queue_names:
+            app.control.add_consumer(bcast_queue_name,
+                                     exchange=queue_name.encode("utf8"),
+                                     exchange_type='fanout',
+                                     routing_key=queue_name.encode("utf8"),
+                                     reply=True)
+            added_queues.append(bcast_queue_name)
+
     return (added_queues, removed_queues)
 
 
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 354c2b9e74..20c8a82a1f 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -9,8 +9,6 @@ import djcelery
 import six
 from datetime import timedelta
 
-from kombu.common import Broadcast
-
 # global settings
 from django.conf import global_settings
 # ugettext lazy
@@ -466,9 +464,7 @@ CELERYD_POOL_RESTARTS = True
 CELERYD_AUTOSCALER = 'awx.main.utils.autoscale:DynamicAutoScaler'
 CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend'
 CELERY_IMPORTS = ('awx.main.scheduler.tasks',)
-CELERY_QUEUES = (
-    Broadcast('tower_broadcast_all'),
-)
+CELERY_QUEUES = ()
 CELERY_ROUTES = {}
 
 

From 202ddae813eca7c88a962f728c0a67f15d9bff95 Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Tue, 1 May 2018 13:13:52 -0400
Subject: [PATCH 025/169] make tower instance group name field read-only

---
 awx/api/serializers.py                               | 5 +++++
 awx/main/tests/functional/api/test_instance_group.py | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index c774898d0d..aa63d0997e 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -4627,6 +4627,11 @@ class InstanceGroupSerializer(BaseSerializer):
                 raise serializers.ValidationError(_('{} is not a valid hostname of an existing instance.').format(instance_name))
         return value
 
+    def validate_name(self, value):
+        if self.instance and self.instance.name == 'tower' and value != 'tower':
+            raise serializers.ValidationError(_('tower instance group name may not be changed.'))
+        return value
+
     def get_jobs_qs(self):
         # Store running jobs queryset in context, so it will be shared in ListView
         if 'running_jobs' not in self.context:
diff --git a/awx/main/tests/functional/api/test_instance_group.py b/awx/main/tests/functional/api/test_instance_group.py
index 3dfd554f11..cd78d0de33 100644
--- a/awx/main/tests/functional/api/test_instance_group.py
+++ b/awx/main/tests/functional/api/test_instance_group.py
@@ -87,7 +87,7 @@ def test_delete_instance_group_jobs_running(delete, instance_group_jobs_running,
 
 
 @pytest.mark.django_db
-def test_modify_delete_tower_instance_group_prevented(delete, options, tower_instance_group, user, patch, put):
+def test_delete_rename_tower_instance_group_prevented(delete, options, tower_instance_group, instance_group, user, patch):
     url = reverse("api:instance_group_detail", kwargs={'pk': tower_instance_group.pk})
     super_user = user('bob', True)
 
@@ -99,6 +99,13 @@ def test_modify_delete_tower_instance_group_prevented(delete, options, tower_ins
     assert 'GET' in resp.data['actions']
     assert 'PUT' in resp.data['actions']
 
+    # Rename 'tower' instance group denied
+    patch(url, {'name': 'tower_prime'}, super_user, expect=400)
+
+    # Rename, other instance group OK
+    url = reverse("api:instance_group_detail", kwargs={'pk': instance_group.pk})
+    patch(url, {'name': 'foobar'}, super_user, expect=200)
+
 
 @pytest.mark.django_db
 def test_prevent_delete_iso_and_control_groups(delete, isolated_instance_group, admin):

From 1963ab689af0627a38a036604abf681fb23dc1bc Mon Sep 17 00:00:00 2001
From: adamscmRH <chadams@redhat.com>
Date: Tue, 1 May 2018 13:31:00 -0400
Subject: [PATCH 026/169] rm an unnecessary uwsgi restart

---
 awx/api/conf.py        | 3 ++-
 awx/api/serializers.py | 9 ++++-----
 awx/conf/apps.py       | 8 --------
 awx/main/tasks.py      | 2 --
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/awx/api/conf.py b/awx/api/conf.py
index 34bf305f20..58aa9b4cc8 100644
--- a/awx/api/conf.py
+++ b/awx/api/conf.py
@@ -4,6 +4,7 @@ from django.utils.translation import ugettext_lazy as _
 # AWX
 from awx.conf import fields, register
 from awx.api.fields import OAuth2ProviderField
+from oauth2_provider.settings import oauth2_settings
 
 
 register(
@@ -36,7 +37,7 @@ register(
 register(
     'OAUTH2_PROVIDER',
     field_class=OAuth2ProviderField,
-    default={'ACCESS_TOKEN_EXPIRE_SECONDS': 315360000000,
+    default={'ACCESS_TOKEN_EXPIRE_SECONDS': oauth2_settings.ACCESS_TOKEN_EXPIRE_SECONDS,
              'AUTHORIZATION_CODE_EXPIRE_SECONDS': 600},
     label=_('OAuth 2 Timeout Settings'),
     help_text=_('Dictionary for customizing OAuth 2 timeouts, available items are '
diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index c774898d0d..bc254cb760 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -14,7 +14,6 @@ from datetime import timedelta
 
 # OAuth2
 from oauthlib.common import generate_token
-from oauth2_provider.settings import oauth2_settings
 
 # Django
 from django.conf import settings
@@ -1024,7 +1023,7 @@ class UserAuthorizedTokenSerializer(BaseSerializer):
         validated_data['user'] = current_user
         validated_data['token'] = generate_token()
         validated_data['expires'] = now() + timedelta(
-            seconds=oauth2_settings.ACCESS_TOKEN_EXPIRE_SECONDS
+            seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS']
         )
         obj = super(OAuth2TokenSerializer, self).create(validated_data)
         obj.save()
@@ -1176,7 +1175,7 @@ class OAuth2TokenSerializer(BaseSerializer):
         validated_data['user'] = current_user
         validated_data['token'] = generate_token()
         validated_data['expires'] = now() + timedelta(
-            seconds=oauth2_settings.ACCESS_TOKEN_EXPIRE_SECONDS
+            seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS']
         )
         obj = super(OAuth2TokenSerializer, self).create(validated_data)
         if obj.application and obj.application.user:
@@ -1239,7 +1238,7 @@ class OAuth2AuthorizedTokenSerializer(BaseSerializer):
         validated_data['user'] = current_user
         validated_data['token'] = generate_token()
         validated_data['expires'] = now() + timedelta(
-            seconds=oauth2_settings.ACCESS_TOKEN_EXPIRE_SECONDS
+            seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS']
         )
         obj = super(OAuth2AuthorizedTokenSerializer, self).create(validated_data)
         if obj.application and obj.application.user:
@@ -1306,7 +1305,7 @@ class OAuth2PersonalTokenSerializer(BaseSerializer):
         validated_data['user'] = self.context['request'].user
         validated_data['token'] = generate_token()
         validated_data['expires'] = now() + timedelta(
-            seconds=oauth2_settings.ACCESS_TOKEN_EXPIRE_SECONDS
+            seconds=settings.OAUTH2_PROVIDER['ACCESS_TOKEN_EXPIRE_SECONDS']
         )
         validated_data['application'] = None
         obj = super(OAuth2PersonalTokenSerializer, self).create(validated_data)
diff --git a/awx/conf/apps.py b/awx/conf/apps.py
index 06c2facb7a..a70d21326c 100644
--- a/awx/conf/apps.py
+++ b/awx/conf/apps.py
@@ -11,16 +11,8 @@ class ConfConfig(AppConfig):
     name = 'awx.conf'
     verbose_name = _('Configuration')
 
-    def configure_oauth2_provider(self, settings):
-        from oauth2_provider import settings as o_settings
-        o_settings.oauth2_settings = o_settings.OAuth2ProviderSettings(
-            settings.OAUTH2_PROVIDER, o_settings.DEFAULTS,
-            o_settings.IMPORT_STRINGS, o_settings.MANDATORY
-        )
-
     def ready(self):
         self.module.autodiscover()
         from .settings import SettingsWrapper
         SettingsWrapper.initialize()
         configure_external_logger(settings)
-        self.configure_oauth2_provider(settings)
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 31edcc38d7..4f6032b12c 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -204,8 +204,6 @@ def handle_setting_changes(self, setting_keys):
         if key.startswith('LOG_AGGREGATOR_'):
             restart_local_services(['uwsgi', 'celery', 'beat', 'callback'])
             break
-        elif key == 'OAUTH2_PROVIDER':
-            restart_local_services(['uwsgi'])
 
 
 @shared_task(bind=True, queue='tower_broadcast_all')

From 079d8e25657d9e87169cfbd29d791a935ebeb2df Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Tue, 1 May 2018 12:36:59 -0700
Subject: [PATCH 027/169] fixes issue with ui-view for network UI

and closes network UI socket connections after closing the network UI
---
 awx/ui/client/index.template.ejs              |  5 +--
 .../components/layout/side-nav.partial.html   |  4 +-
 .../network-nav/network.nav.block.less        |  2 +
 .../network-nav/network.nav.controller.js     |  1 +
 .../src/network-ui/network.ui.controller.js   | 39 +++++++++++--------
 awx/ui/client/src/network-ui/style.less       |  1 +
 6 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/awx/ui/client/index.template.ejs b/awx/ui/client/index.template.ejs
index 6f6a5c2cba..f16282bd91 100644
--- a/awx/ui/client/index.template.ejs
+++ b/awx/ui/client/index.template.ejs
@@ -19,14 +19,13 @@
 </head>
 
 <body data-user-agent="{{userAgent}}">
-    <div ui-view="networking"><div>
+    <div ui-view="networking"></div>
     <at-layout>
         <bread-crumb></bread-crumb>
         <toast></toast>
         <div class="container-fluid" id="content-container">
             <div class="row">
-                <div class="col-lg-12" ui-view>
-                </div>
+                <div class="col-lg-12" ui-view></div>
             </div>
             <!-- Password Dialog -->
             <div id="password-modal" style="display: none;"></div>
diff --git a/awx/ui/client/lib/components/layout/side-nav.partial.html b/awx/ui/client/lib/components/layout/side-nav.partial.html
index 8996df899f..5786c13537 100644
--- a/awx/ui/client/lib/components/layout/side-nav.partial.html
+++ b/awx/ui/client/lib/components/layout/side-nav.partial.html
@@ -1,7 +1,7 @@
 <div class="at-Layout-side"
-    ng-class="{'at-Layout-side--expanded': vm.isExpanded && layoutVm.isLoggedIn}" ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing">
+    ng-class="{'at-Layout-side--expanded': vm.isExpanded && layoutVm.isLoggedIn}" ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing && layoutVm.currentState !== 'inventories.edit.networking'">
         <div class="at-Layout-sideNavItem at-Layout-sideNavToggle" ng-click="vm.toggleExpansion()"
-            ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing">
+            ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing && layoutVm.currentState !== 'inventories.edit.networking'">
                 <i class="fa fa-bars"></i>
         </div>
         <ng-transclude></ng-transclude>
diff --git a/awx/ui/client/src/network-ui/network-nav/network.nav.block.less b/awx/ui/client/src/network-ui/network-nav/network.nav.block.less
index 8cb4006389..552c0151bc 100644
--- a/awx/ui/client/src/network-ui/network-nav/network.nav.block.less
+++ b/awx/ui/client/src/network-ui/network-nav/network.nav.block.less
@@ -4,6 +4,7 @@
     width:100%;
     align-items: flex-end;
     position:absolute;
+    z-index: 1100;
 }
 
 .Networking-top{
@@ -135,6 +136,7 @@
 
 .Networking-dropDown{
     left:-2px!important;
+    z-index: 1101;
 }
 
 .Networking-searchButton{
diff --git a/awx/ui/client/src/network-ui/network-nav/network.nav.controller.js b/awx/ui/client/src/network-ui/network-nav/network.nav.controller.js
index f05bee4dd7..820ed7e37d 100644
--- a/awx/ui/client/src/network-ui/network-nav/network.nav.controller.js
+++ b/awx/ui/client/src/network-ui/network-nav/network.nav.controller.js
@@ -16,6 +16,7 @@ function NetworkingController (models, $state, $scope, strings) {
     vm.groups = [];
     $scope.devices = [];
     vm.close = () => {
+        $scope.$broadcast('awxNet-closeNetworkUI');
         $state.go('inventories');
     };
 
diff --git a/awx/ui/client/src/network-ui/network.ui.controller.js b/awx/ui/client/src/network-ui/network.ui.controller.js
index a261b326bb..7f324988c7 100644
--- a/awx/ui/client/src/network-ui/network.ui.controller.js
+++ b/awx/ui/client/src/network-ui/network.ui.controller.js
@@ -25,6 +25,7 @@ var NetworkUIController = function($scope,
                                    $http,
                                    $q,
                                    $state,
+                                   $log,
                                    ProcessErrors,
                                    ConfigService,
                                    rbacUiControlService) {
@@ -269,19 +270,19 @@ var NetworkUIController = function($scope,
       $scope.for_each_page('/api/v2/inventories/' + $scope.inventory_id + '/hosts/',
            function(all_results) {
                let hosts = all_results;
-               console.log(hosts.length);
+               $log.debug(hosts.length);
                for(var i = 0; i<hosts.length; i++) {
-                   console.log(i);
+                   $log.debug(i);
                    try {
                        let device_type = null;
                        let device_name = null;
                        let device = null;
                        let host = hosts[i];
                        device_name = host.name;
-                       console.log(device_name);
+                       $log.debug(device_name);
                        if (host.variables !== "") {
                            host.data = jsyaml.safeLoad(host.variables);
-                           console.log(host.data);
+                           $log.debug(host.data);
                        } else {
                            host.data = {};
                        }
@@ -297,14 +298,14 @@ var NetworkUIController = function($scope,
                            $scope.update_links_in_vars_by_device(device_name, host.data);
                        }
                        if ($scope.devices_by_name[device_name] === undefined) {
-                           console.log(['adding', device_name]);
+                           $log.debug(['adding', device_name]);
                            device = new models.Device(0, device_name, 0, 0, device_type, host.id);
                            device.icon = true;
                            device.variables = host.data;
                            $scope.inventory_toolbox.items.push(device);
                        }
                    } catch (error) {
-                       console.log(error);
+                       $log.debug(error);
                    }
                }
            }, 100);
@@ -950,7 +951,7 @@ var NetworkUIController = function($scope,
     };
 
     $scope.create_device = function(data) {
-        console.log(data);
+        $log.debug(data);
         var device = new models.Device(data.id,
                                        data.name,
                                        data.x,
@@ -979,7 +980,7 @@ var NetworkUIController = function($scope,
     };
 
     $scope.onLinkCreate = function(data) {
-        console.log(data);
+        $log.debug(data);
         $scope.create_link(data);
     };
 
@@ -1011,7 +1012,7 @@ var NetworkUIController = function($scope,
                 }
             }
         }
-        console.log(new_link);
+        $log.debug(new_link);
         if (new_link.from_interface !== null && new_link.to_interface !== null) {
             new_link.from_interface.dot();
             new_link.to_interface.dot();
@@ -1227,12 +1228,12 @@ var NetworkUIController = function($scope,
             $scope.link_id_seq = util.natural_numbers(max_link_id);
         }
 
-        console.log(['data.inventory_toolbox', data.inventory_toolbox]);
+        $log.debug(['data.inventory_toolbox', data.inventory_toolbox]);
         if (data.inventory_toolbox !== undefined) {
             $scope.inventory_toolbox.items = [];
             for (i = 0; i < data.inventory_toolbox.length; i++) {
                 device = data.inventory_toolbox[i];
-                console.log(device);
+                $log.debug(device);
                 if (device.device_type === undefined) {
                     device.device_type = device.type;
                 }
@@ -1247,7 +1248,7 @@ var NetworkUIController = function($scope,
 				}
                 $scope.inventory_toolbox.items.push(new_device);
             }
-            console.log($scope.inventory_toolbox.items);
+            $log.debug($scope.inventory_toolbox.items);
         }
 
         $scope.updateInterfaceDots();
@@ -1322,6 +1323,12 @@ var NetworkUIController = function($scope,
         }
     };
 
+    $scope.$on('awxNet-closeNetworkUI', function(){
+        $scope.control_socket.close();
+        if ($scope.tests_enabled) {
+            $scope.test_socket.close();
+        }
+    });
 
     // End web socket
     //
@@ -1345,10 +1352,10 @@ var NetworkUIController = function($scope,
         $scope.$apply();
     }, 17);
 
-    console.log("Network UI started");
+    $log.debug("Network UI started");
 
     $scope.$on('$destroy', function () {
-        console.log("Network UI stopping");
+        $log.debug("Network UI stopping");
         $scope.first_channel.send('UnbindDocument', {});
     });
 
@@ -1380,7 +1387,7 @@ var NetworkUIController = function($scope,
             try {
                 $scope.first_channel.send(test_event.msg_type, test_event);
             } catch (err) {
-                console.log(["Test Error:", $scope.current_test, err]);
+                $log.debug(["Test Error:", $scope.current_test, err]);
                 $scope.test_errors.push(err);
             }
         }
@@ -1455,7 +1462,7 @@ var NetworkUIController = function($scope,
         }
         $scope.animations = [];
     };
+    $log.debug("Network UI loaded");
 };
 
 exports.NetworkUIController = NetworkUIController;
-console.log("Network UI loaded");
diff --git a/awx/ui/client/src/network-ui/style.less b/awx/ui/client/src/network-ui/style.less
index b49b66c8f8..8ea255e279 100644
--- a/awx/ui/client/src/network-ui/style.less
+++ b/awx/ui/client/src/network-ui/style.less
@@ -42,6 +42,7 @@
 
 .NetworkUI {
     background-color: @light-toolbox-background;
+    z-index: 1100;
 }
 
 .NetworkUI__text {

From dead84da1aa28ba4781313937a39d43645c577ec Mon Sep 17 00:00:00 2001
From: adamscmRH <chadams@redhat.com>
Date: Tue, 1 May 2018 16:57:17 -0400
Subject: [PATCH 028/169] add auth cookies

---
 awx/api/generics.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/awx/api/generics.py b/awx/api/generics.py
index e12949515b..eae3fe62f8 100644
--- a/awx/api/generics.py
+++ b/awx/api/generics.py
@@ -6,6 +6,7 @@ import inspect
 import logging
 import time
 import six
+import urllib    
 
 # Django
 from django.conf import settings
@@ -29,6 +30,7 @@ from rest_framework.response import Response
 from rest_framework import status
 from rest_framework import views
 from rest_framework.permissions import AllowAny
+from rest_framework.renderers import JSONRenderer
 
 # cryptography
 from cryptography.fernet import InvalidToken
@@ -39,7 +41,7 @@ from awx.main.models import *  # noqa
 from awx.main.access import access_registry
 from awx.main.utils import * # noqa
 from awx.main.utils.db import get_all_field_names
-from awx.api.serializers import ResourceAccessListElementSerializer, CopySerializer
+from awx.api.serializers import ResourceAccessListElementSerializer, CopySerializer, UserSerializer
 from awx.api.versioning import URLPathVersioning, get_request_version
 from awx.api.metadata import SublistAttachDetatchMetadata, Metadata
 
@@ -70,6 +72,13 @@ class LoggedLoginView(auth_views.LoginView):
         if current_user and getattr(current_user, 'pk', None) and current_user != original_user:
             logger.info("User {} logged in.".format(current_user.username))
         if request.user.is_authenticated:
+            logger.info(smart_text(u"User {} logged in".format(self.request.user.username)))
+            ret.set_cookie('userLoggedIn', 'true')
+            current_user = UserSerializer(self.request.user)
+            current_user = JSONRenderer().render(current_user.data)
+            current_user = urllib.quote('%s' % current_user, '')
+            ret.set_cookie('current_user', current_user)
+            
             return ret
         else:
             ret.status_code = 401
@@ -82,6 +91,7 @@ class LoggedLogoutView(auth_views.LogoutView):
         original_user = getattr(request, 'user', None)
         ret = super(LoggedLogoutView, self).dispatch(request, *args, **kwargs)
         current_user = getattr(request, 'user', None)
+        ret.set_cookie('userLoggedIn', 'false')
         if (not current_user or not getattr(current_user, 'pk', True)) \
                 and current_user != original_user:
             logger.info("User {} logged out.".format(original_user.username))

From a79632968cf4e42af7bbf99ddf1c56a79c0a0d9b Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Tue, 1 May 2018 15:19:44 -0700
Subject: [PATCH 029/169] Fixes job template schedule link from Activity Stream

---
 .../src/activity-stream/factories/build-anchor.factory.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
index 2b01398280..1fc031e0e6 100644
--- a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
+++ b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
@@ -38,7 +38,7 @@ export default function BuildAnchor($log, $filter) {
                  case 'schedule':
                      // schedule urls depend on the resource they're associated with
                      if (activity.summary_fields.job_template){
-                         url += 'job_templates/' + activity.summary_fields.job_template.id + '/schedules/' + obj.id;
+                         url += 'templates/job_template/' + activity.summary_fields.job_template.id + '/schedules/' + obj.id;
                      }
                      else if (activity.summary_fields.project){
                          url += 'projects/' + activity.summary_fields.project.id + '/schedules/' + obj.id;

From a840ec408931418c92ea6a43107496a7f6521bb1 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Tue, 1 May 2018 15:36:47 -0700
Subject: [PATCH 030/169] Fixes jobs' page activity stream link, and remove AS
 button on job results page

---
 awx/ui/client/features/jobs/routes/jobs.route.js | 2 ++
 awx/ui/client/features/output/index.js           | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/features/jobs/routes/jobs.route.js b/awx/ui/client/features/jobs/routes/jobs.route.js
index c3ee0b4fef..9129fed3d1 100644
--- a/awx/ui/client/features/jobs/routes/jobs.route.js
+++ b/awx/ui/client/features/jobs/routes/jobs.route.js
@@ -22,6 +22,8 @@ export default {
         }
     },
     data: {
+        activityStream: true,
+        activityStreamTarget: 'job',
         socket: {
             groups: {
                 jobs: ['status_changed'],
diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js
index 3aaadc2553..35fa91ef6e 100644
--- a/awx/ui/client/features/output/index.js
+++ b/awx/ui/client/features/output/index.js
@@ -169,8 +169,7 @@ function JobsRun ($stateRegistry) {
         url: '/jobz/:type/:id?job_event_search',
         route: '/jobz/:type/:id?job_event_search',
         data: {
-            activityStream: true,
-            activityStreamTarget: 'jobs'
+            activityStream: false,
         },
         views: {
             '@': {

From 63542c3b436fa5a02e566fb9774c1a024a6ed650 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Tue, 1 May 2018 16:05:22 -0700
Subject: [PATCH 031/169] Don't render tooltips that shouldn't exist

---
 awx/ui/client/lib/components/list/row.partial.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/lib/components/list/row.partial.html b/awx/ui/client/lib/components/list/row.partial.html
index 0f1d88d22d..dc6dfbd9f0 100644
--- a/awx/ui/client/lib/components/list/row.partial.html
+++ b/awx/ui/client/lib/components/list/row.partial.html
@@ -1,6 +1,6 @@
 <div class="at-Row" id="row-{{ templateId }}">
     <div class="at-Row--invalid" ng-show="invalid">
-        <at-popover state="invalidTooltip"></at-popover>
+        <at-popover state="invalidTooltip" ng-if="invalidTooltip"></at-popover>
     </div>
     <div class="at-Row-content" ng-transclude></div>
 </div>

From cf0efe969ef52507205d85a60f480650a8116dc2 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Tue, 1 May 2018 16:20:44 -0700
Subject: [PATCH 032/169] Changes "Cancel" to "OK" on cancel-job-prompt modal

---
 awx/ui/client/features/jobs/jobsList.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js
index 4959d41b5e..dbb32a93c3 100644
--- a/awx/ui/client/features/jobs/jobsList.controller.js
+++ b/awx/ui/client/features/jobs/jobsList.controller.js
@@ -174,7 +174,7 @@ function ListJobsController (
             resourceName: $filter('sanitize')(job.name),
             body: deleteModalBody,
             action,
-            actionText: strings.get('CANCEL')
+            actionText: strings.get('OK')
         });
     };
 

From 83d5fef67cea897e533bed81ae255f3d89eb2268 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Wed, 2 May 2018 01:02:56 -0400
Subject: [PATCH 033/169] conditionally hide scroll

---
 awx/ui/client/features/output/_index.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/features/output/_index.less b/awx/ui/client/features/output/_index.less
index 0bb8a72aba..524951ecbc 100644
--- a/awx/ui/client/features/output/_index.less
+++ b/awx/ui/client/features/output/_index.less
@@ -303,7 +303,7 @@
     grid-template-rows: minmax(500px, ~"calc(100vh - 140px)");
 
     .at-Panel {
-        overflow-y: scroll;
+        overflow-y: auto;
     }
 }
 

From 0c8b2a98723e524eb0d0ef86a9aef1a42ffb448e Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Wed, 2 May 2018 01:03:13 -0400
Subject: [PATCH 034/169] remove unused service

---
 awx/ui/client/features/output/details.directive.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/features/output/details.directive.js b/awx/ui/client/features/output/details.directive.js
index d4e590e1c3..e55f3a8d81 100644
--- a/awx/ui/client/features/output/details.directive.js
+++ b/awx/ui/client/features/output/details.directive.js
@@ -509,8 +509,7 @@ function AtJobDetailsController (
     _strings_,
     _status_,
     _wait_,
-    ParseTypeChange,
-    ParseVariableString,
+    _parse_,
 ) {
     vm = this || {};
 
@@ -519,7 +518,7 @@ function AtJobDetailsController (
     $state = _$state_;
 
     error = _error_;
-    parse = ParseVariableString;
+    parse = _parse_;
     prompt = _prompt_;
     strings = _strings_;
     status = _status_;
@@ -588,7 +587,6 @@ AtJobDetailsController.$inject = [
     'JobStrings',
     'JobStatusService',
     'Wait',
-    'ParseTypeChange',
     'ParseVariableString',
 ];
 

From dce52d05525759889d0bcda68b01d37a38f988e4 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Tue, 1 May 2018 14:14:28 -0400
Subject: [PATCH 035/169] Update the Add button content and styles

* Change the text from "Add" to "+"
* Update the e2e test to check for an id #button-add
---
 awx/ui/client/features/_index.less              |  1 -
 .../applications/list-applications.view.html    |  1 +
 awx/ui/client/features/credentials/_index.less  |  3 ---
 .../features/credentials/legacy.credentials.js  |  4 ++--
 .../features/templates/templates.strings.js     |  1 -
 .../features/templates/templatesList.view.html  |  6 ++----
 .../users/tokens/users-tokens-list.partial.html |  1 +
 awx/ui/client/legacy/styles/ansible-ui.less     |  6 ++++--
 awx/ui/client/legacy/styles/lists.less          | 17 +++--------------
 awx/ui/client/lib/components/list/_index.less   | 11 -----------
 awx/ui/client/lib/theme/_global.less            |  5 +++--
 .../credential-types/credential-types.list.js   |  4 ++--
 .../client/src/credentials/credentials.form.js  |  5 +++--
 .../client/src/credentials/credentials.list.js  |  4 ++--
 .../instances/instances-list.partial.html       |  1 +
 .../list/instance-groups-list.partial.html      |  1 +
 .../related/groups/hosts-related-groups.list.js |  4 ++--
 .../inventories/inventory.list.js               |  4 ++--
 .../inventories/related/groups/groups.list.js   |  4 ++--
 .../nested-groups/group-nested-groups.list.js   |  4 ++--
 .../nested-hosts/group-nested-hosts.list.js     |  4 ++--
 .../related/hosts/related-host.list.js          |  4 ++--
 .../nested-groups/host-nested-groups.list.js    |  4 ++--
 .../inventories/related/sources/sources.list.js |  4 ++--
 .../smart-inventory/smart-inventory.form.js     |  4 ++--
 .../standard-inventory/inventory.form.js        |  4 ++--
 .../inventory-scripts/inventory-scripts.list.js |  4 ++--
 .../notifications/notificationTemplates.list.js |  4 ++--
 .../linkout/organizations-linkout.route.js      |  7 +++----
 .../list/organizations-list.partial.html        |  7 +++----
 .../src/organizations/organizations.form.js     |  4 ++--
 .../src/organizations/organizations.list.js     |  4 ++--
 awx/ui/client/src/projects/projects.form.js     |  4 ++--
 awx/ui/client/src/projects/projects.list.js     |  4 ++--
 awx/ui/client/src/scheduler/schedules.list.js   |  4 ++--
 awx/ui/client/src/shared/generator-helpers.js   |  1 +
 .../list-generator/list-actions.partial.html    | 12 ++++++------
 awx/ui/client/src/teams/teams.form.js           |  8 ++++----
 awx/ui/client/src/teams/teams.list.js           |  4 ++--
 .../job_templates/job-template.form.js          |  4 ++--
 awx/ui/client/src/templates/templates.list.js   |  4 ++--
 awx/ui/client/src/templates/workflows.form.js   |  4 ++--
 awx/ui/client/src/users/users.form.js           |  4 ++--
 awx/ui/client/src/users/users.list.js           |  4 ++--
 awx/ui/test/e2e/objects/credentialTypes.js      |  2 +-
 awx/ui/test/e2e/objects/credentials.js          |  2 +-
 awx/ui/test/e2e/objects/inventories.js          |  6 +++---
 awx/ui/test/e2e/objects/inventoryScripts.js     |  2 +-
 .../test/e2e/objects/notificationTemplates.js   |  2 +-
 awx/ui/test/e2e/objects/organizations.js        |  2 +-
 awx/ui/test/e2e/objects/projects.js             |  2 +-
 awx/ui/test/e2e/objects/sections/permissions.js |  2 +-
 awx/ui/test/e2e/objects/teams.js                |  2 +-
 awx/ui/test/e2e/objects/templates.js            |  4 ++--
 awx/ui/test/e2e/objects/users.js                |  2 +-
 awx/ui/test/e2e/tests/smoke.js                  |  5 ++---
 56 files changed, 104 insertions(+), 127 deletions(-)
 delete mode 100644 awx/ui/client/features/credentials/_index.less

diff --git a/awx/ui/client/features/_index.less b/awx/ui/client/features/_index.less
index 59e8e4630b..04be5b31bb 100644
--- a/awx/ui/client/features/_index.less
+++ b/awx/ui/client/features/_index.less
@@ -1,3 +1,2 @@
-@import 'credentials/_index';
 @import 'output/_index';
 @import 'users/tokens/_index';
diff --git a/awx/ui/client/features/applications/list-applications.view.html b/awx/ui/client/features/applications/list-applications.view.html
index 1803e5ab66..1dd96b2dc1 100644
--- a/awx/ui/client/features/applications/list-applications.view.html
+++ b/awx/ui/client/features/applications/list-applications.view.html
@@ -23,6 +23,7 @@
                     type="button"
                     ui-sref="applications.add"
                     class="at-Button--add"
+                    id="button-add"
                     aria-haspopup="true"
                     aria-expanded="false">
                 </button>
diff --git a/awx/ui/client/features/credentials/_index.less b/awx/ui/client/features/credentials/_index.less
deleted file mode 100644
index 87f746b2c3..0000000000
--- a/awx/ui/client/features/credentials/_index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.at-CredentialsPermissions {
-    margin-top: 50px;
-}
diff --git a/awx/ui/client/features/credentials/legacy.credentials.js b/awx/ui/client/features/credentials/legacy.credentials.js
index 07cee1329d..27428feb7b 100644
--- a/awx/ui/client/features/credentials/legacy.credentials.js
+++ b/awx/ui/client/features/credentials/legacy.credentials.js
@@ -69,8 +69,8 @@ function LegacyCredentialsService () {
                         ngClick: '$state.go(\'.add\')',
                         label: 'Add',
                         awToolTip: N_('Add a permission'),
-                        actionClass: 'btn List-buttonSubmit',
-                        buttonContent: `&#43; ${N_('ADD')}`,
+                        actionClass: 'at-Button--add',
+                        actionId: 'button-add',
                         ngShow: '(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                     }
                 },
diff --git a/awx/ui/client/features/templates/templates.strings.js b/awx/ui/client/features/templates/templates.strings.js
index 896cfd87bd..3bb2d38b66 100644
--- a/awx/ui/client/features/templates/templates.strings.js
+++ b/awx/ui/client/features/templates/templates.strings.js
@@ -10,7 +10,6 @@ function TemplatesStrings (BaseString) {
 
     ns.list = {
         PANEL_TITLE: t.s('TEMPLATES'),
-        ADD_BUTTON_LABEL: t.s('ADD'),
         ADD_DD_JT_LABEL: t.s('Job Template'),
         ADD_DD_WF_LABEL: t.s('Workflow Template'),
         ROW_ITEM_LABEL_ACTIVITY: t.s('Activity'),
diff --git a/awx/ui/client/features/templates/templatesList.view.html b/awx/ui/client/features/templates/templatesList.view.html
index e68ddef8fb..2608a04177 100644
--- a/awx/ui/client/features/templates/templatesList.view.html
+++ b/awx/ui/client/features/templates/templatesList.view.html
@@ -14,13 +14,11 @@
         <div class="at-List-toolbarAction" ng-show="canAdd">
             <button
                 type="button"
-                class="at-List-toolbarActionButton at-Button--success"
+                class="at-Button--add"
+                id="button-add"
                 data-toggle="dropdown"
                 aria-haspopup="true"
                 aria-expanded="false">
-                    &#43; {{:: vm.strings.get('list.ADD_BUTTON_LABEL') }}
-                    <span class="at-List-toolbarDropdownCarat"></span>
-                    <span class="sr-only">Toggle Dropdown</span>
             </button>
             <ul class="dropdown-menu at-List-toolbarActionDropdownMenu">
                 <li>
diff --git a/awx/ui/client/features/users/tokens/users-tokens-list.partial.html b/awx/ui/client/features/users/tokens/users-tokens-list.partial.html
index 390361faba..e460e5ecf4 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-list.partial.html
+++ b/awx/ui/client/features/users/tokens/users-tokens-list.partial.html
@@ -14,6 +14,7 @@
             type="button"
             ui-sref=".add"
             class="at-Button--add"
+            id="button-add"
             aria-haspopup="true"
             aria-expanded="false">
         </button>
diff --git a/awx/ui/client/legacy/styles/ansible-ui.less b/awx/ui/client/legacy/styles/ansible-ui.less
index 1963ac4361..6349dfbd61 100644
--- a/awx/ui/client/legacy/styles/ansible-ui.less
+++ b/awx/ui/client/legacy/styles/ansible-ui.less
@@ -883,9 +883,11 @@ input[type="checkbox"].checkbox-no-label {
 
 /* Display list actions next to search widget */
 .list-actions {
-    text-align: right;
-    margin-bottom: -34px;
+    display: flex;
     height: 34px;
+    justify-content: flex-end;
+    margin-bottom: -34px;
+    text-align: right;
 
     .fa-lg {
         vertical-align: -8%;
diff --git a/awx/ui/client/legacy/styles/lists.less b/awx/ui/client/legacy/styles/lists.less
index 36cc6f0b47..f7746f8664 100644
--- a/awx/ui/client/legacy/styles/lists.less
+++ b/awx/ui/client/legacy/styles/lists.less
@@ -220,6 +220,7 @@ table, tbody {
 }
 
 .List-actions {
+    align-items: center;
     display: flex;
     margin-bottom: -34px;
 }
@@ -235,10 +236,6 @@ table, tbody {
     width: 200px;
 }
 
-.List-action:not(.ng-hide) ~ .List-action:not(.ng-hide) {
-    margin-left: 20px;
-}
-
 .List-buttonSubmit {
     background-color: @submit-button-bg;
     color: @submit-button-text;
@@ -254,6 +251,8 @@ table, tbody {
     background-color: @btn-bg;
     color: @btn-txt;
     border-color: @b7grey;
+    height: 30px;
+    line-height: 14px;
 }
 
 .List-buttonDefault:hover,
@@ -465,16 +464,6 @@ table, tbody {
     background-color: @submit-button-bg-hov;
 }
 
-.List-dropdownCarat {
-    display: inline-block;
-    width: 0;
-    height: 0;
-    vertical-align: middle;
-    border-top: 4px dashed;
-    border-right: 4px solid transparent;
-    border-left: 4px solid transparent;
-}
-
 .List-infoCell {
     display: flex;
     justify-content: flex-end;
diff --git a/awx/ui/client/lib/components/list/_index.less b/awx/ui/client/lib/components/list/_index.less
index dfcb74adad..5e05d07c69 100644
--- a/awx/ui/client/lib/components/list/_index.less
+++ b/awx/ui/client/lib/components/list/_index.less
@@ -45,17 +45,6 @@
     min-width: 80px;
 }
 
-.at-List-toolbarDropdownCarat {
-    margin-left: @at-margin-left-toolbar-carat;
-    display: inline-block;
-    width: 0;
-    height: 0;
-    vertical-align: middle;
-    border-top: 4px dashed;
-    border-right: 4px solid transparent;
-    border-left: 4px solid transparent;
-}
-
 .at-List-toolbarActionDropdownMenu {
     float: right;
     right: 0;
diff --git a/awx/ui/client/lib/theme/_global.less b/awx/ui/client/lib/theme/_global.less
index 109e316be5..b172089c23 100644
--- a/awx/ui/client/lib/theme/_global.less
+++ b/awx/ui/client/lib/theme/_global.less
@@ -23,8 +23,9 @@
         content: "+";
         font-size: 20px;
     }
-    border-color: transparent;
-    margin-left: @at-space-2x;
+    border: none;
+    display: flex;
+    margin-left: @at-space-4x;
 }
 
 .at-Button--info {
diff --git a/awx/ui/client/src/credential-types/credential-types.list.js b/awx/ui/client/src/credential-types/credential-types.list.js
index 8bd6981aa9..5b6d73fcd3 100644
--- a/awx/ui/client/src/credential-types/credential-types.list.js
+++ b/awx/ui/client/src/credential-types/credential-types.list.js
@@ -40,8 +40,8 @@ export default ['i18n', function(i18n){
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addCredentialType()',
                 awToolTip: i18n._('Create a new credential type'),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd'
             }
         },
diff --git a/awx/ui/client/src/credentials/credentials.form.js b/awx/ui/client/src/credentials/credentials.form.js
index 088dbd7737..293a4df58c 100644
--- a/awx/ui/client/src/credentials/credentials.form.js
+++ b/awx/ui/client/src/credentials/credentials.form.js
@@ -442,11 +442,12 @@ export default ['i18n', function(i18n) {
                     open: false,
                     actions: {
                         add: {
+                            mode: 'all',
                             ngClick: "$state.go('.add')",
                             label: 'Add',
                             awToolTip: i18n._('Add a permission'),
-                            actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '&#43; ' + i18n._('ADD'),
+                            actionClass: 'at-Button--add',
+                            actionId: 'button-add',
                             ngShow: '(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                         }
                     },
diff --git a/awx/ui/client/src/credentials/credentials.list.js b/awx/ui/client/src/credentials/credentials.list.js
index fbc4c826d5..465283f134 100644
--- a/awx/ui/client/src/credentials/credentials.list.js
+++ b/awx/ui/client/src/credentials/credentials.list.js
@@ -50,8 +50,8 @@ export default ['i18n', function(i18n) {
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addCredential()',
                 awToolTip: i18n._('Create a new credential'),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: "true"
             }
         },
diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
index 5a7a26021d..512b74f867 100644
--- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
@@ -27,6 +27,7 @@
                     type="button"
                     ng-click="$state.go('instanceGroups.instances.modal.add')"
                     class="at-Button--add"
+                    id="button-add"
                     ng-show="vm.isSuperuser"
                     aria-expanded="false">
                 </button>
diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
index 8d75d6bc72..2fa0440c1e 100644
--- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
+++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
@@ -23,6 +23,7 @@
                     type="button"
                     ui-sref="instanceGroups.add"
                     class="at-Button--add"
+                    id="button-add"
                     ng-show="vm.isSuperuser"
                     aria-haspopup="true"
                     aria-expanded="false">
diff --git a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js
index 47840e3179..b51f233f4a 100644
--- a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js
+++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js
@@ -49,8 +49,8 @@ export default ['i18n', function(i18n) {
                 mode: 'all',
                 ngClick: "associateGroup()",
                 awToolTip: i18n._("Associate this host with a new group"),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ASSOCIATE GROUP'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd',
                 dataPlacement: "top",
             }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js b/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js
index 07991c8397..141de6d5a9 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js
@@ -73,8 +73,8 @@ export default ['i18n', function(i18n) {
                 type: 'buttonDropdown',
                 basePaths: ['inventories'],
                 awToolTip: i18n._('Create a new inventory'),
-                actionClass: 'btn List-dropdownSuccess',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 options: [
                     {
                         optionContent: i18n._('Inventory'),
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js
index fb85c360ed..971ff36c97 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/groups.list.js
@@ -67,8 +67,8 @@
                 mode: 'all',
                 ngClick: "createGroup()",
                 awToolTip: i18n._("Create a new group"),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD GROUP'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd',
                 dataPlacement: "top",
             }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js
index 95df7e4348..38730de270 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js
@@ -67,8 +67,8 @@
                 mode: 'all',
                 type: 'buttonDropdown',
                 awToolTip: i18n._("Add a group"),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd',
                 dataPlacement: "top",
                 options: [
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js
index c3a7aef417..a6af0d8c71 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js
@@ -116,8 +116,8 @@ export default ['i18n', function(i18n) {
                 mode: 'all',
                 type: 'buttonDropdown',
                 awToolTip: i18n._("Add a host"),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd',
                 dataPlacement: "top",
                 options: [
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js
index 24262c1017..f56f6c4f07 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js
@@ -121,8 +121,8 @@ export default ['i18n', function(i18n) {
                 mode: 'all',
                 ngClick: "createHost()",
                 awToolTip: i18n._("Create a new host"),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD HOST'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd',
                 dataPlacement: "top",
             }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js
index a41e3399f5..e544040e5b 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js
@@ -67,8 +67,8 @@
                 mode: 'all',
                 ngClick: 'associateGroup()',
                 awToolTip: i18n._("Associate an existing group"),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ASSOCIATE GROUP'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd',
                 dataPlacement: "top",
             }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js
index d2daa6b571..f06d1f3738 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js
@@ -66,8 +66,8 @@
                 mode: 'all',
                 ngClick: "createSource()",
                 awToolTip: i18n._("Create a new source"),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD SOURCE'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd',
                 dataPlacement: "top",
             }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js
index 46df8595b0..01a49b008b 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js
@@ -113,8 +113,8 @@ export default ['i18n', function(i18n) {
                             label: i18n._('Add'),
                             ngClick: "$state.go('.add')",
                             awToolTip: i18n._('Add a permission'),
-                            actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '&#43; ADD',
+                            actionClass: 'at-Button--add',
+                            actionId: 'button-add',
                             ngShow: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
 
                         }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js
index ab8d562088..1c9f1dd13d 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js
@@ -115,8 +115,8 @@ function(i18n) {
                         label: i18n._('Add'),
                         ngClick: "$state.go('.add')",
                         awToolTip: i18n._('Add a permission'),
-                        actionClass: 'btn List-buttonSubmit',
-                        buttonContent: '&#43; ADD',
+                        actionClass: 'at-Button--add',
+                        actionId: 'button-add',
                         ngShow: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
 
                     }
diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js
index 9c0ffd2a1d..071c3a796f 100644
--- a/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js
+++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js
@@ -38,8 +38,8 @@ export default ['i18n', function(i18n){
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addCustomInv()',
                 awToolTip: i18n._('Create a new custom inventory'),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd'
             }
         },
diff --git a/awx/ui/client/src/notifications/notificationTemplates.list.js b/awx/ui/client/src/notifications/notificationTemplates.list.js
index 0e7182be9a..523c54947e 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.list.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.list.js
@@ -50,8 +50,8 @@ export default ['i18n', function(i18n){
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addNotification()',
                 awToolTip: i18n._('Create a new notification template'),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd'
             }
         },
diff --git a/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js b/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
index 20f8b6a6c3..f605f6c08e 100644
--- a/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
+++ b/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
@@ -63,9 +63,9 @@ let lists = [{
             list.basePath = `${GetBasePath('organizations')}${$stateParams.organization_id}/users`;
             list.searchRowActions = {
                 add: {
-                    buttonContent: '&#43; ADD user',
                     awToolTip: 'Add existing user to organization',
-                    actionClass: 'btn List-buttonSubmit',
+                    actionClass: 'at-Button--add',
+                    actionId: 'button-add',
                     ngClick: 'addUsers()'
                 }
             };
@@ -273,9 +273,8 @@ let lists = [{
             list.basePath = `${GetBasePath('organizations')}${$stateParams.organization_id}/admins`;
             list.searchRowActions = {
                 add: {
-                    buttonContent: '&#43; ADD administrator',
                     awToolTip: 'Add existing user to organization as administrator',
-                    actionClass: 'btn List-buttonSubmit',
+                    actionClass: 'at-Button--add',
                     ngClick: 'addUsers()'
                 }
             };
diff --git a/awx/ui/client/src/organizations/list/organizations-list.partial.html b/awx/ui/client/src/organizations/list/organizations-list.partial.html
index 7d7384184d..8a7a2feee6 100644
--- a/awx/ui/client/src/organizations/list/organizations-list.partial.html
+++ b/awx/ui/client/src/organizations/list/organizations-list.partial.html
@@ -16,12 +16,11 @@
         <div class="List-well">
             <div class="List-actionHolder">
                 <div class="List-actions">
-                    <!-- &#43; ADD -->
-                    <button class="btn List-buttonSubmit"
+                    <button class="at-Button--add"
+                        id="button-add"
                         aw-tool-tip="{{'Create a new organization'|translate}}"
                         ng-show="canAdd"
-                        ng-click="addOrganization()" translate>
-                        + ADD
+                        ng-click="addOrganization()">
                     </button>
                 </div>
             </div>
diff --git a/awx/ui/client/src/organizations/organizations.form.js b/awx/ui/client/src/organizations/organizations.form.js
index f33dd00526..c6744f3dc6 100644
--- a/awx/ui/client/src/organizations/organizations.form.js
+++ b/awx/ui/client/src/organizations/organizations.form.js
@@ -92,8 +92,8 @@ export default ['NotificationsList', 'i18n',
                             ngClick: "$state.go('.add')",
                             label: i18n._('Add'),
                             awToolTip: i18n._('Add Users to this organization.'),
-                            actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '&#43; ' + i18n._('ADD'),
+                            actionClass: 'at-Button--add',
+                            actionId: 'button-add',
                             ngShow: '(organization_obj.summary_fields.user_capabilities.edit || canAdd)'
                         }
                     },
diff --git a/awx/ui/client/src/organizations/organizations.list.js b/awx/ui/client/src/organizations/organizations.list.js
index 7f849310da..3337dc2a87 100644
--- a/awx/ui/client/src/organizations/organizations.list.js
+++ b/awx/ui/client/src/organizations/organizations.list.js
@@ -33,8 +33,8 @@ export default [function() {
                 ngClick: 'addOrganization()',
                 awToolTip: 'Create a new organization',
                 awFeature: 'multiple_organizations',
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ADD'
+                actionClass: 'at-Button--add',
+                actionId: 'button-add'
             }
         },
 
diff --git a/awx/ui/client/src/projects/projects.form.js b/awx/ui/client/src/projects/projects.form.js
index baa204bcee..1862f28722 100644
--- a/awx/ui/client/src/projects/projects.form.js
+++ b/awx/ui/client/src/projects/projects.form.js
@@ -253,8 +253,8 @@ export default ['i18n', 'NotificationsList', 'TemplateList',
                         ngClick: "$state.go('.add')",
                         label: 'Add',
                         awToolTip: i18n._('Add a permission'),
-                        actionClass: 'btn List-buttonSubmit',
-                        buttonContent: '&#43; ' + i18n._('ADD'),
+                        actionClass: 'at-Button--add',
+                        actionId: 'button-add',
                         ngShow: '(project_obj.summary_fields.user_capabilities.edit || canAdd)'
                     }
                 },
diff --git a/awx/ui/client/src/projects/projects.list.js b/awx/ui/client/src/projects/projects.list.js
index f4d504304c..478809ad79 100644
--- a/awx/ui/client/src/projects/projects.list.js
+++ b/awx/ui/client/src/projects/projects.list.js
@@ -74,8 +74,8 @@ export default ['i18n', function(i18n) {
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addProject()',
                 awToolTip: i18n._('Create a new project'),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: "canAdd"
             }
         },
diff --git a/awx/ui/client/src/scheduler/schedules.list.js b/awx/ui/client/src/scheduler/schedules.list.js
index 70f785ecdf..c1e3e54185 100644
--- a/awx/ui/client/src/scheduler/schedules.list.js
+++ b/awx/ui/client/src/scheduler/schedules.list.js
@@ -72,8 +72,8 @@ export default ['i18n', function(i18n) {
                 mode: 'all',
                 ngClick: 'addSchedule()',
                 awToolTip: i18n._('Add a new schedule'),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd'
             }
         },
diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js
index f365aeb042..de973cff2f 100644
--- a/awx/ui/client/src/shared/generator-helpers.js
+++ b/awx/ui/client/src/shared/generator-helpers.js
@@ -751,6 +751,7 @@ angular.module('GeneratorHelpers', [systemStatus.name])
         html += (options.dataPlacement) ? "data-placement=\"" + options.dataPlacement + "\" " : "";
         html += (options.dataContainer) ? "data-container=\"" + options.dataContainer + "\" " : "";
         html += (options.actionClass) ? "class=\"" + options.actionClass + "\" " : "";
+        html += (options.actionId) ? "id=\"" + options.actionId + "\" " : "";
         html += (options.dataTitle) ? "data-title=\"" + options.dataTitle + "\" " : "";
         html += (options.ngDisabled) ? "ng-disabled=\"" + options.ngDisabled + "\" " : "";
         html += (options.ngClick) ? "ng-click=\"$eval(" + options.ngClick + ")\" " : "";
diff --git a/awx/ui/client/src/shared/list-generator/list-actions.partial.html b/awx/ui/client/src/shared/list-generator/list-actions.partial.html
index bf3265f32f..2c937334b0 100644
--- a/awx/ui/client/src/shared/list-generator/list-actions.partial.html
+++ b/awx/ui/client/src/shared/list-generator/list-actions.partial.html
@@ -4,9 +4,8 @@
     <div ng-if="options.type && options.type === 'template'" ng-include="options.template" ng-show="{{options.ngShow}}"></div>
     <div class="List-action--showTooltipOnDisabled" ng-if="options.showTipWhenDisabled" aw-tool-tip="{{options.awToolTip}}" data-tip-watch="{{options.dataTipWatch}}" data-placement="{{options.dataPlacement}}" data-container="{{options.dataContainer}}" data-title="{{options.dataTitle}}" data-tooltip-inner-class="{{options.tooltipInnerClass}}">
         <div class="btn-group" ng-if="options.type === 'buttonDropdown'" ng-disabled="{{options.ngDisabled}}">
-            <button type="button" class="{{options.actionClass}} List-dropdownButton" ng-bind-html="options.buttonContent" translate></button>
-            <button type="button" class="{{options.actionClass}} List-dropdownButton List-dropdownCaratButton dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                <span class="List-dropdownCarat"></span>
+            <button type="button" class="{{options.actionClass}} List-dropdownButton" id="{{options.actionId}}" ng-bind-html="options.buttonContent" translate></button>
+            <button type="button" class="List-dropdownButton dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <span class="sr-only">Toggle Dropdown</span>
             </button>
             <ul class="dropdown-menu pull-right">
@@ -20,6 +19,7 @@
                 toolbar-button
                 mode="options.mode"
                 class="{{options.actionClass}}"
+                id="{{options.actionId}}"
                 ng-disabled="{{options.ngDisabled}}"
                 ng-show="{{options.ngShow}}"
                 ng-click="$eval(options.ngClick)"
@@ -31,9 +31,8 @@
     </div>
     <span ng-if="!options.showTipWhenDisabled">
         <div class="btn-group" ng-if="options.type === 'buttonDropdown'" ng-disabled="{{options.ngDisabled}}" aw-tool-tip="{{options.awToolTip}}" data-tip-watch="{{options.dataTipWatch}}" data-placement="{{options.dataPlacement}}" data-container="{{options.dataContainer}}" ng-show="{{options.ngShow}}">
-            <button type="button" class="{{options.actionClass}} List-dropdownButton dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button type="button" class="{{options.actionClass}} List-dropdownButton dropdown-toggle" id="{{options.actionId}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <span  ng-bind-html="options.buttonContent" translate></span>
-                <span class="List-dropdownCarat"></span>
                 <span class="sr-only">Toggle Dropdown</span>
             </button>
             <ul class="dropdown-menu pull-right">
@@ -51,13 +50,14 @@
                 data-placement="{{options.dataPlacement}}"
                 data-container="{{options.dataContainer}}"
                 class="{{options.actionClass}}"
+                id="{{options.actionId}}"
                 data-title="{{options.dataTitle}}"
                 ng-disabled="{{options.ngDisabled}}"
                 ng-click="$eval(options.ngClick)"
                 ng-show="{{options.ngShow}}"
                 toolbar="true"
                 aw-feature="{{options.awFeature}}">
-                <span ng-bind-html="options.buttonContent" translate></span>
+                <span ng-if="options.buttonContent" ng-bind-html="options.buttonContent" translate></span>
             </button>
         </span>
     </span>
diff --git a/awx/ui/client/src/teams/teams.form.js b/awx/ui/client/src/teams/teams.form.js
index 855d8519d1..1b3fa842ad 100644
--- a/awx/ui/client/src/teams/teams.form.js
+++ b/awx/ui/client/src/teams/teams.form.js
@@ -84,8 +84,8 @@ export default ['i18n', function(i18n) {
                             ngClick: "$state.go('.add')",
                             label: i18n._('Add'),
                             awToolTip: i18n._('Add User'),
-                            actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '&#43; ' + i18n._('ADD'),
+                            actionClass: 'at-Button--add',
+                            actionId: 'button-add',
                             ngShow: '(team_obj.summary_fields.user_capabilities.edit || canAdd)'
                         }
                     },
@@ -156,8 +156,8 @@ export default ['i18n', function(i18n) {
                             ngClick: "$state.go('.add')",
                             label: 'Add',
                             awToolTip: i18n._('Grant Permission'),
-                            actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '&#43; ' + i18n._('ADD PERMISSIONS'),
+                            actionClass: 'at-Button--add',
+                            actionId: 'button-add',
                             ngShow: '(team_obj.summary_fields.user_capabilities.edit || canAdd)'
                         }
                     }
diff --git a/awx/ui/client/src/teams/teams.list.js b/awx/ui/client/src/teams/teams.list.js
index 1af52a8084..d776f01cd7 100644
--- a/awx/ui/client/src/teams/teams.list.js
+++ b/awx/ui/client/src/teams/teams.list.js
@@ -41,8 +41,8 @@ export default ['i18n', function(i18n) {
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addTeam()',
                 awToolTip: i18n._('Create a new team'),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd && canEdit'
             }
         },
diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js
index cd2824b8a3..4bb46c5b22 100644
--- a/awx/ui/client/src/templates/job_templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job_templates/job-template.form.js
@@ -403,8 +403,8 @@ function(NotificationsList, i18n) {
                             ngClick: "$state.go('.add')",
                             label: 'Add',
                             awToolTip: i18n._('Add a permission'),
-                            actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '&#43; ' + i18n._('ADD'),
+                            actionClass: 'at-Button--add',
+                            actionId: 'button-add',
                             ngShow: '(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
                         }
                     },
diff --git a/awx/ui/client/src/templates/templates.list.js b/awx/ui/client/src/templates/templates.list.js
index 17534209f2..464fe5550e 100644
--- a/awx/ui/client/src/templates/templates.list.js
+++ b/awx/ui/client/src/templates/templates.list.js
@@ -54,8 +54,8 @@ export default ['i18n', function(i18n) {
                 type: 'buttonDropdown',
                 basePaths: ['templates'],
                 awToolTip: i18n._('Create a new template'),
-                actionClass: 'btn List-dropdownSuccess',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 options: [
                     {
                         optionContent: i18n._('Job Template'),
diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js
index 7be0a70472..33c9568eef 100644
--- a/awx/ui/client/src/templates/workflows.form.js
+++ b/awx/ui/client/src/templates/workflows.form.js
@@ -147,8 +147,8 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
                             ngClick: "$state.go('.add')",
                             label: i18n._('Add'),
                             awToolTip: i18n._('Add a permission'),
-                            actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '&#43; '+ i18n._('ADD'),
+                            actionClass: 'at-Button--add',
+                            actionId: 'button-add',
                             ngShow: '(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate)'
                         }
                     },
diff --git a/awx/ui/client/src/users/users.form.js b/awx/ui/client/src/users/users.form.js
index 93a1264edd..2a40b524d5 100644
--- a/awx/ui/client/src/users/users.form.js
+++ b/awx/ui/client/src/users/users.form.js
@@ -215,8 +215,8 @@ export default ['i18n', function(i18n) {
                             ngClick: "$state.go('.add')",
                             label: 'Add',
                             awToolTip: i18n._('Grant Permission'),
-                            actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '&#43; ' + i18n._('ADD PERMISSIONS'),
+                            actionClass: 'at-Button--add',
+                            actionId: 'button-add',
                             ngShow: '(!is_superuser && (user_obj.summary_fields.user_capabilities.edit || canAdd))'
                         }
                     },
diff --git a/awx/ui/client/src/users/users.list.js b/awx/ui/client/src/users/users.list.js
index 95ff26f5e6..4bedeb44b8 100644
--- a/awx/ui/client/src/users/users.list.js
+++ b/awx/ui/client/src/users/users.list.js
@@ -46,8 +46,8 @@ export default ['i18n', function(i18n) {
                 ngClick: 'addUser()',
                 basePaths: ['organizations', 'users'], // base path must be in list, or action not available
                 awToolTip: i18n._('Create a new user'),
-                actionClass: 'btn List-buttonSubmit',
-                buttonContent: '&#43; ' + i18n._('ADD'),
+                actionClass: 'at-Button--add',
+                actionId: 'button-add',
                 ngShow: 'canAdd && canEdit'
             }
         },
diff --git a/awx/ui/test/e2e/objects/credentialTypes.js b/awx/ui/test/e2e/objects/credentialTypes.js
index 302bbd61ae..7ea9ec298d 100644
--- a/awx/ui/test/e2e/objects/credentialTypes.js
+++ b/awx/ui/test/e2e/objects/credentialTypes.js
@@ -28,7 +28,7 @@ const addEditPanel = {
 const listPanel = {
     selector: 'div[ui-view="list"]',
     elements: {
-        add: '.List-buttonSubmit',
+        add: '#button-add',
         badge: 'div[class="List-titleBadge]',
         titleText: 'div[class="List-titleText"]',
         noitems: 'div[class="List-noItems"]'
diff --git a/awx/ui/test/e2e/objects/credentials.js b/awx/ui/test/e2e/objects/credentials.js
index a4225f2873..cc2c45ff9d 100644
--- a/awx/ui/test/e2e/objects/credentials.js
+++ b/awx/ui/test/e2e/objects/credentials.js
@@ -251,7 +251,7 @@ module.exports = {
             elements: {
                 badge: 'span[class~="badge"]',
                 title: 'div[class="List-titleText"]',
-                add: 'button[class~="List-buttonSubmit"]'
+                add: '#button-add'
             },
             sections: {
                 search,
diff --git a/awx/ui/test/e2e/objects/inventories.js b/awx/ui/test/e2e/objects/inventories.js
index 794a72f760..0fc95f4360 100644
--- a/awx/ui/test/e2e/objects/inventories.js
+++ b/awx/ui/test/e2e/objects/inventories.js
@@ -121,9 +121,9 @@ module.exports = {
             return this.navigate();
         },
         selectAdd (name) {
-            this.api.waitForElementVisible('button span[class="List-dropdownCarat"]');
-            this.expect.element('button span[class="List-dropdownCarat"]').enabled;
-            this.api.click('button span[class="List-dropdownCarat"]');
+            this.api.waitForElementVisible('button[id="button-add"]');
+            this.expect.element('button[id="button-add"]').enabled;
+            this.api.click('button[id="button-add"]');
 
             this.api.useXpath();
             this.api.waitForElementVisible(`.//a[normalize-space(text())="${name}"]`);
diff --git a/awx/ui/test/e2e/objects/inventoryScripts.js b/awx/ui/test/e2e/objects/inventoryScripts.js
index 4555ac11ff..e2f49fe1cc 100644
--- a/awx/ui/test/e2e/objects/inventoryScripts.js
+++ b/awx/ui/test/e2e/objects/inventoryScripts.js
@@ -59,7 +59,7 @@ module.exports = {
             elements: {
                 badge: 'span[class~="badge"]',
                 title: 'div[class="List-titleText"]',
-                add: 'button[class~="List-buttonSubmit"]'
+                add: '#button-add'
             },
             sections: {
                 search,
diff --git a/awx/ui/test/e2e/objects/notificationTemplates.js b/awx/ui/test/e2e/objects/notificationTemplates.js
index dabe450cbb..9dd80df53f 100644
--- a/awx/ui/test/e2e/objects/notificationTemplates.js
+++ b/awx/ui/test/e2e/objects/notificationTemplates.js
@@ -64,7 +64,7 @@ module.exports = {
             elements: {
                 badge: 'span[class~="badge"]',
                 title: 'div[class="List-titleText"]',
-                add: 'button[class~="List-buttonSubmit"]'
+                add: '#button-add'
             },
             sections: {
                 search,
diff --git a/awx/ui/test/e2e/objects/organizations.js b/awx/ui/test/e2e/objects/organizations.js
index f5eda6580b..40fef9a256 100644
--- a/awx/ui/test/e2e/objects/organizations.js
+++ b/awx/ui/test/e2e/objects/organizations.js
@@ -61,7 +61,7 @@ module.exports = {
             elements: {
                 badge: 'span[class~="badge"]',
                 title: 'div[class="List-titleText"]',
-                add: 'button[class~="List-buttonSubmit"]'
+                add: '#button-add'
             },
             sections: {
                 search,
diff --git a/awx/ui/test/e2e/objects/projects.js b/awx/ui/test/e2e/objects/projects.js
index d40bcffb65..85965c4019 100644
--- a/awx/ui/test/e2e/objects/projects.js
+++ b/awx/ui/test/e2e/objects/projects.js
@@ -60,7 +60,7 @@ module.exports = {
             elements: {
                 badge: 'span[class~="badge"]',
                 title: 'div[class="List-titleText"]',
-                add: 'button[class~="List-buttonSubmit"]'
+                add: '#button-add'
             },
             sections: {
                 search,
diff --git a/awx/ui/test/e2e/objects/sections/permissions.js b/awx/ui/test/e2e/objects/sections/permissions.js
index 66a9d467fe..958568157b 100644
--- a/awx/ui/test/e2e/objects/sections/permissions.js
+++ b/awx/ui/test/e2e/objects/sections/permissions.js
@@ -6,7 +6,7 @@ import search from './search';
 const permissions = {
     selector: 'div[ui-view="related"]',
     elements: {
-        add: 'button[class="btn List-buttonSubmit"]',
+        add: '#button-add',
         badge: 'div[class="List-titleBadge]',
         titleText: 'div[class="List-titleText"]',
         noitems: 'div[class="List-noItems"]'
diff --git a/awx/ui/test/e2e/objects/teams.js b/awx/ui/test/e2e/objects/teams.js
index 64d33b2b1a..485206b00c 100644
--- a/awx/ui/test/e2e/objects/teams.js
+++ b/awx/ui/test/e2e/objects/teams.js
@@ -58,7 +58,7 @@ module.exports = {
             elements: {
                 badge: 'span[class~="badge"]',
                 title: 'div[class="List-titleText"]',
-                add: 'button[class~="List-buttonSubmit"]'
+                add: '#button-add'
             },
             sections: {
                 search,
diff --git a/awx/ui/test/e2e/objects/templates.js b/awx/ui/test/e2e/objects/templates.js
index cb59cdaaf2..5ab6025dd6 100644
--- a/awx/ui/test/e2e/objects/templates.js
+++ b/awx/ui/test/e2e/objects/templates.js
@@ -94,7 +94,7 @@ module.exports = {
             elements: {
                 badge: 'span[class~="badge"]',
                 title: 'div[class="List-titleText"]',
-                add: 'button[class~="List-buttonSubmit"]'
+                add: '#button-add'
             },
             sections: {
                 search,
@@ -127,7 +127,7 @@ module.exports = {
             return this;
         },
         selectAdd (name) {
-            this.clickWhenEnabled('button span[class="at-List-toolbarDropdownCarat"]');
+            this.clickWhenEnabled(`#button-add`);
 
             this.api
                 .useXpath()
diff --git a/awx/ui/test/e2e/objects/users.js b/awx/ui/test/e2e/objects/users.js
index d808dd5103..9b78588a21 100644
--- a/awx/ui/test/e2e/objects/users.js
+++ b/awx/ui/test/e2e/objects/users.js
@@ -58,7 +58,7 @@ module.exports = {
             elements: {
                 badge: 'span[class~="badge"]',
                 title: 'div[class="List-titleText"]',
-                add: 'button[class~="List-buttonSubmit"]'
+                add: '#button-add'
             },
             sections: {
                 search,
diff --git a/awx/ui/test/e2e/tests/smoke.js b/awx/ui/test/e2e/tests/smoke.js
index b77b23d69d..cce3e052ea 100644
--- a/awx/ui/test/e2e/tests/smoke.js
+++ b/awx/ui/test/e2e/tests/smoke.js
@@ -124,7 +124,7 @@ module.exports = {
         inventories.waitForElementNotVisible('div.spinny');
     },
     'create host': client => {
-        const addHost = './/span[text()="+ ADD HOST"]';
+        const addHost = '.hostsList #button-add';
 
         client.expect.element('#hosts_tab').enabled;
         client.expect.element('#hosts_tab').css('opacity').equal('1');
@@ -136,11 +136,10 @@ module.exports = {
 
         client.expect.element('#hosts_tab').css('background-color').contain('132, 137, 146');
 
-        client.useXpath();
+        client.useCss();
         client.waitForElementVisible(addHost);
         client.expect.element(addHost).enabled;
         client.click(addHost);
-        client.useCss();
 
         client.waitForElementVisible('#host_name');
         client.sendKeys('#host_name', 'localhost');

From ac20aa954ad9471d2b67a9c55c7e85f3f47c540a Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Mon, 30 Apr 2018 15:51:25 -0400
Subject: [PATCH 036/169] Replace logging-related restart with dynamic handler

refactor existing handlers to be the related
  "real" handler classes, which are swapped
  out dynamically by external logger "proxy" handler class

real handler swapout only done on setting change

remove restart_local_services method
get rid of uWSGI fifo file

change TCP/UDP return type contract so that it mirrors
  the request futures object
add details to socket error messages
---
 Makefile                                      |   2 +-
 awx/conf/apps.py                              |   3 -
 awx/conf/tests/functional/test_api.py         |  11 +-
 awx/conf/views.py                             |   7 +-
 awx/main/tasks.py                             |  18 +-
 .../tests/functional/api/test_settings.py     |  14 +-
 awx/main/tests/unit/conftest.py               |  14 +
 awx/main/tests/unit/utils/test_filters.py     |  33 ++-
 awx/main/tests/unit/utils/test_handlers.py    | 202 +++++--------
 awx/main/tests/unit/utils/test_reload.py      |  28 --
 awx/main/utils/filters.py                     | 100 ++++++-
 awx/main/utils/formatters.py                  |  26 +-
 awx/main/utils/handlers.py                    | 279 +++++++++---------
 awx/main/utils/reload.py                      |  35 ---
 awx/settings/defaults.py                      |  14 +-
 awx/settings/development.py                   |   2 -
 awx/settings/production.py                    |   2 -
 17 files changed, 396 insertions(+), 394 deletions(-)

diff --git a/Makefile b/Makefile
index e7df5b3d48..f4e4984b24 100644
--- a/Makefile
+++ b/Makefile
@@ -296,7 +296,7 @@ uwsgi: collectstatic
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
 	fi; \
-    uwsgi -b 32768 --socket 127.0.0.1:8050 --module=awx.wsgi:application --home=/venv/awx --chdir=/awx_devel/ --vacuum --processes=5 --harakiri=120 --master --no-orphans --py-autoreload 1 --max-requests=1000 --stats /tmp/stats.socket --master-fifo=/awxfifo --lazy-apps --logformat "%(addr) %(method) %(uri) - %(proto) %(status)" --hook-accepting1-once="exec:/bin/sh -c '[ -f /tmp/celery_pid ] && kill -1 `cat /tmp/celery_pid` || true'"
+    uwsgi -b 32768 --socket 127.0.0.1:8050 --module=awx.wsgi:application --home=/venv/awx --chdir=/awx_devel/ --vacuum --processes=5 --harakiri=120 --master --no-orphans --py-autoreload 1 --max-requests=1000 --stats /tmp/stats.socket --lazy-apps --logformat "%(addr) %(method) %(uri) - %(proto) %(status)" --hook-accepting1-once="exec:/bin/sh -c '[ -f /tmp/celery_pid ] && kill -1 `cat /tmp/celery_pid` || true'"
 
 daphne:
 	@if [ "$(VENV_BASE)" ]; then \
diff --git a/awx/conf/apps.py b/awx/conf/apps.py
index a70d21326c..4f9a36395c 100644
--- a/awx/conf/apps.py
+++ b/awx/conf/apps.py
@@ -2,8 +2,6 @@
 from django.apps import AppConfig
 # from django.core import checks
 from django.utils.translation import ugettext_lazy as _
-from awx.main.utils.handlers import configure_external_logger
-from django.conf import settings
 
 
 class ConfConfig(AppConfig):
@@ -15,4 +13,3 @@ class ConfConfig(AppConfig):
         self.module.autodiscover()
         from .settings import SettingsWrapper
         SettingsWrapper.initialize()
-        configure_external_logger(settings)
diff --git a/awx/conf/tests/functional/test_api.py b/awx/conf/tests/functional/test_api.py
index 0e845238f6..1be22ee2dc 100644
--- a/awx/conf/tests/functional/test_api.py
+++ b/awx/conf/tests/functional/test_api.py
@@ -338,13 +338,14 @@ def test_setting_singleton_delete_no_read_only_fields(api_request, dummy_setting
 
 @pytest.mark.django_db
 def test_setting_logging_test(api_request):
-    with mock.patch('awx.conf.views.BaseHTTPSHandler.perform_test') as mock_func:
+    with mock.patch('awx.conf.views.AWXProxyHandler.perform_test') as mock_func:
         api_request(
             'post',
             reverse('api:setting_logging_test'),
             data={'LOG_AGGREGATOR_HOST': 'http://foobar', 'LOG_AGGREGATOR_TYPE': 'logstash'}
         )
-        test_arguments = mock_func.call_args[0][0]
-        assert test_arguments.LOG_AGGREGATOR_HOST == 'http://foobar'
-        assert test_arguments.LOG_AGGREGATOR_TYPE == 'logstash'
-        assert test_arguments.LOG_AGGREGATOR_LEVEL == 'DEBUG'
+        call = mock_func.call_args_list[0]
+        args, kwargs = call
+        given_settings = kwargs['custom_settings']
+        assert given_settings.LOG_AGGREGATOR_HOST == 'http://foobar'
+        assert given_settings.LOG_AGGREGATOR_TYPE == 'logstash'
diff --git a/awx/conf/views.py b/awx/conf/views.py
index 60ea39d911..e10fe7ad32 100644
--- a/awx/conf/views.py
+++ b/awx/conf/views.py
@@ -21,7 +21,7 @@ from awx.api.generics import *  # noqa
 from awx.api.permissions import IsSuperUser
 from awx.api.versioning import reverse, get_request_version
 from awx.main.utils import *  # noqa
-from awx.main.utils.handlers import BaseHTTPSHandler, UDPHandler, LoggingConnectivityException
+from awx.main.utils.handlers import AWXProxyHandler, LoggingConnectivityException
 from awx.main.tasks import handle_setting_changes
 from awx.conf.license import get_licensed_features
 from awx.conf.models import Setting
@@ -198,12 +198,9 @@ class SettingLoggingTest(GenericAPIView):
             mock_settings = MockSettings()
             for k, v in serializer.validated_data.items():
                 setattr(mock_settings, k, v)
-            mock_settings.LOG_AGGREGATOR_LEVEL = 'DEBUG'
+            AWXProxyHandler().perform_test(custom_settings=mock_settings)
             if mock_settings.LOG_AGGREGATOR_PROTOCOL.upper() == 'UDP':
-                UDPHandler.perform_test(mock_settings)
                 return Response(status=status.HTTP_201_CREATED)
-            else:
-                BaseHTTPSHandler.perform_test(mock_settings)
         except LoggingConnectivityException as e:
             return Response({'error': str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
         return Response(status=status.HTTP_200_OK)
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index cdf2a11354..22e6dff090 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -29,7 +29,7 @@ except Exception:
 
 # Celery
 from celery import Task, shared_task, Celery
-from celery.signals import celeryd_init, worker_process_init, worker_shutdown, worker_ready, celeryd_after_setup
+from celery.signals import celeryd_init, worker_shutdown, worker_ready, celeryd_after_setup
 
 # Django
 from django.conf import settings
@@ -59,10 +59,9 @@ from awx.main.utils import (get_ansible_version, get_ssh_version, decrypt_field,
                             wrap_args_with_proot, OutputEventFilter, OutputVerboseFilter, ignore_inventory_computed_fields,
                             ignore_inventory_group_removal, get_type_for_model, extract_ansible_vars)
 from awx.main.utils.safe_yaml import safe_dump, sanitize_jinja
-from awx.main.utils.reload import restart_local_services, stop_local_services
+from awx.main.utils.reload import stop_local_services
 from awx.main.utils.pglock import advisory_lock
 from awx.main.utils.ha import update_celery_worker_routes, register_celery_worker_queues
-from awx.main.utils.handlers import configure_external_logger
 from awx.main.consumers import emit_channel_notification
 from awx.conf import settings_registry
 
@@ -117,15 +116,6 @@ def celery_startup(conf=None, **kwargs):
             logger.exception(six.text_type("Failed to rebuild schedule {}.").format(sch))
 
 
-@worker_process_init.connect
-def task_set_logger_pre_run(*args, **kwargs):
-    try:
-        cache.close()
-        configure_external_logger(settings, is_startup=False)
-    except Exception:
-        logger.exception('Encountered error on initial log configuration.')
-
-
 @worker_shutdown.connect
 def inform_cluster_of_shutdown(*args, **kwargs):
     try:
@@ -200,10 +190,6 @@ def handle_setting_changes(self, setting_keys):
     cache_keys = set(setting_keys)
     logger.debug('cache delete_many(%r)', cache_keys)
     cache.delete_many(cache_keys)
-    for key in cache_keys:
-        if key.startswith('LOG_AGGREGATOR_'):
-            restart_local_services(['uwsgi', 'celery', 'beat', 'callback'])
-            break
 
 
 @shared_task(bind=True, exchange='tower_broadcast_all')
diff --git a/awx/main/tests/functional/api/test_settings.py b/awx/main/tests/functional/api/test_settings.py
index 5974a1a935..97effe0fa3 100644
--- a/awx/main/tests/functional/api/test_settings.py
+++ b/awx/main/tests/functional/api/test_settings.py
@@ -14,7 +14,7 @@ import mock
 # AWX
 from awx.api.versioning import reverse
 from awx.conf.models import Setting
-from awx.main.utils.handlers import BaseHTTPSHandler, LoggingConnectivityException
+from awx.main.utils.handlers import AWXProxyHandler, LoggingConnectivityException
 
 import six
 
@@ -217,7 +217,7 @@ def test_logging_aggregrator_connection_test_bad_request(get, post, admin, key):
 
 @pytest.mark.django_db
 def test_logging_aggregrator_connection_test_valid(mocker, get, post, admin):
-    with mock.patch.object(BaseHTTPSHandler, 'perform_test') as perform_test:
+    with mock.patch.object(AWXProxyHandler, 'perform_test') as perform_test:
         url = reverse('api:setting_logging_test')
         user_data = {
             'LOG_AGGREGATOR_TYPE': 'logstash',
@@ -227,7 +227,8 @@ def test_logging_aggregrator_connection_test_valid(mocker, get, post, admin):
             'LOG_AGGREGATOR_PASSWORD': 'mcstash'
         }
         post(url, user_data, user=admin, expect=200)
-        create_settings = perform_test.call_args[0][0]
+        args, kwargs = perform_test.call_args_list[0]
+        create_settings = kwargs['custom_settings']
         for k, v in user_data.items():
             assert hasattr(create_settings, k)
             assert getattr(create_settings, k) == v
@@ -238,7 +239,7 @@ def test_logging_aggregrator_connection_test_with_masked_password(mocker, patch,
     url = reverse('api:setting_singleton_detail', kwargs={'category_slug': 'logging'})
     patch(url, user=admin, data={'LOG_AGGREGATOR_PASSWORD': 'password123'}, expect=200)
 
-    with mock.patch.object(BaseHTTPSHandler, 'perform_test') as perform_test:
+    with mock.patch.object(AWXProxyHandler, 'perform_test') as perform_test:
         url = reverse('api:setting_logging_test')
         user_data = {
             'LOG_AGGREGATOR_TYPE': 'logstash',
@@ -248,13 +249,14 @@ def test_logging_aggregrator_connection_test_with_masked_password(mocker, patch,
             'LOG_AGGREGATOR_PASSWORD': '$encrypted$'
         }
         post(url, user_data, user=admin, expect=200)
-        create_settings = perform_test.call_args[0][0]
+        args, kwargs = perform_test.call_args_list[0]
+        create_settings = kwargs['custom_settings']
         assert getattr(create_settings, 'LOG_AGGREGATOR_PASSWORD') == 'password123'
 
 
 @pytest.mark.django_db
 def test_logging_aggregrator_connection_test_invalid(mocker, get, post, admin):
-    with mock.patch.object(BaseHTTPSHandler, 'perform_test') as perform_test:
+    with mock.patch.object(AWXProxyHandler, 'perform_test') as perform_test:
         perform_test.side_effect = LoggingConnectivityException('404: Not Found')
         url = reverse('api:setting_logging_test')
         resp = post(url, {
diff --git a/awx/main/tests/unit/conftest.py b/awx/main/tests/unit/conftest.py
index 7a5ae40f79..2307b3a47d 100644
--- a/awx/main/tests/unit/conftest.py
+++ b/awx/main/tests/unit/conftest.py
@@ -1,4 +1,5 @@
 import pytest
+import logging
 
 from mock import PropertyMock
 
@@ -7,3 +8,16 @@ from mock import PropertyMock
 def _disable_database_settings(mocker):
     m = mocker.patch('awx.conf.settings.SettingsWrapper.all_supported_settings', new_callable=PropertyMock)
     m.return_value = []
+
+
+@pytest.fixture()
+def dummy_log_record():
+    return logging.LogRecord(
+        'awx', # logger name
+        20, # loglevel INFO
+        './awx/some/module.py', # pathname
+        100, # lineno
+        'User joe logged in', # msg
+        tuple(), # args,
+        None # exc_info
+    )
diff --git a/awx/main/tests/unit/utils/test_filters.py b/awx/main/tests/unit/utils/test_filters.py
index c0b38d294c..a8127fdfb6 100644
--- a/awx/main/tests/unit/utils/test_filters.py
+++ b/awx/main/tests/unit/utils/test_filters.py
@@ -5,7 +5,7 @@ import mock
 from collections import namedtuple
 
 # AWX
-from awx.main.utils.filters import SmartFilter
+from awx.main.utils.filters import SmartFilter, ExternalLoggerEnabled
 
 # Django
 from django.db.models import Q
@@ -13,6 +13,37 @@ from django.db.models import Q
 import six
 
 
+@pytest.mark.parametrize('params, logger_name, expected', [
+    # skip all records if enabled_flag = False
+    ({'enabled_flag': False}, 'awx.main', False),
+    # skip all records if the host is undefined
+    ({'enabled_flag': True}, 'awx.main', False),
+    # skip all records if underlying logger is used by handlers themselves
+    ({'enabled_flag': True}, 'awx.main.utils.handlers', False),
+    ({'enabled_flag': True, 'enabled_loggers': ['awx']}, 'awx.main', True),
+    ({'enabled_flag': True, 'enabled_loggers': ['abc']}, 'awx.analytics.xyz', False),
+    ({'enabled_flag': True, 'enabled_loggers': ['xyz']}, 'awx.analytics.xyz', True),
+])
+def test_base_logging_handler_skip_log(params, logger_name, expected, dummy_log_record):
+    filter = ExternalLoggerEnabled(**params)
+    dummy_log_record.name = logger_name
+    assert filter.filter(dummy_log_record) is expected, (params, logger_name)
+
+
+@pytest.mark.parametrize('level, expect', [
+    (30, True),  # warning
+    (20, False)  # info
+])
+def test_log_configurable_severity(level, expect, dummy_log_record):
+    dummy_log_record.levelno = level
+    filter = ExternalLoggerEnabled(
+        enabled_flag=True,
+        enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'],
+        lvl='WARNING'
+    )
+    assert filter.filter(dummy_log_record) is expect
+
+
 Field = namedtuple('Field', 'name')
 Meta = namedtuple('Meta', 'fields')
 
diff --git a/awx/main/tests/unit/utils/test_handlers.py b/awx/main/tests/unit/utils/test_handlers.py
index 693d024281..f57d86158d 100644
--- a/awx/main/tests/unit/utils/test_handlers.py
+++ b/awx/main/tests/unit/utils/test_handlers.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import base64
 import cStringIO
-import json
 import logging
 import socket
 import datetime
@@ -10,7 +9,6 @@ from uuid import uuid4
 
 import mock
 
-from django.conf import settings
 from django.conf import LazySettings
 import pytest
 import requests
@@ -18,23 +16,11 @@ from requests_futures.sessions import FuturesSession
 
 from awx.main.utils.handlers import (BaseHandler, BaseHTTPSHandler as HTTPSHandler,
                                      TCPHandler, UDPHandler, _encode_payload_for_socket,
-                                     PARAM_NAMES, LoggingConnectivityException)
+                                     PARAM_NAMES, LoggingConnectivityException,
+                                     AWXProxyHandler)
 from awx.main.utils.formatters import LogstashFormatter
 
 
-@pytest.fixture()
-def dummy_log_record():
-    return logging.LogRecord(
-        'awx', # logger name
-        20, # loglevel INFO
-        './awx/some/module.py', # pathname
-        100, # lineno
-        'User joe logged in', # msg
-        tuple(), # args,
-        None # exc_info
-    )
-
-
 @pytest.fixture()
 def http_adapter():
     class FakeHTTPAdapter(requests.adapters.HTTPAdapter):
@@ -80,105 +66,91 @@ def test_https_logging_handler_requests_async_implementation():
 
 
 def test_https_logging_handler_has_default_http_timeout():
-    handler = HTTPSHandler.from_django_settings(settings)
+    handler = TCPHandler()
     assert handler.tcp_timeout == 5
 
 
-@pytest.mark.parametrize('param', PARAM_NAMES.keys())
+@pytest.mark.parametrize('param', ['host', 'port', 'indv_facts'])
 def test_base_logging_handler_defaults(param):
     handler = BaseHandler()
     assert hasattr(handler, param) and getattr(handler, param) is None
 
 
-@pytest.mark.parametrize('param', PARAM_NAMES.keys())
+@pytest.mark.parametrize('param', ['host', 'port', 'indv_facts'])
 def test_base_logging_handler_kwargs(param):
     handler = BaseHandler(**{param: 'EXAMPLE'})
     assert hasattr(handler, param) and getattr(handler, param) == 'EXAMPLE'
 
 
-@pytest.mark.parametrize('param, django_settings_name', PARAM_NAMES.items())
-def test_base_logging_handler_from_django_settings(param, django_settings_name):
+@pytest.mark.parametrize('params', [
+    {
+        'LOG_AGGREGATOR_HOST': 'https://server.invalid',
+        'LOG_AGGREGATOR_PORT': 22222,
+        'LOG_AGGREGATOR_TYPE': 'loggly',
+        'LOG_AGGREGATOR_USERNAME': 'foo',
+        'LOG_AGGREGATOR_PASSWORD': 'bar',
+        'LOG_AGGREGATOR_INDIVIDUAL_FACTS': True,
+        'LOG_AGGREGATOR_TCP_TIMEOUT': 96,
+        'LOG_AGGREGATOR_VERIFY_CERT': False,
+        'LOG_AGGREGATOR_PROTOCOL': 'https'
+    },
+    {
+        'LOG_AGGREGATOR_HOST': 'https://server.invalid',
+        'LOG_AGGREGATOR_PORT': 22222,
+        'LOG_AGGREGATOR_PROTOCOL': 'udp'
+    }
+])
+def test_real_handler_from_django_settings(params):
+    settings = LazySettings()
+    settings.configure(**params)
+    handler = AWXProxyHandler().get_handler(custom_settings=settings)
+    # need the _reverse_ dictionary from PARAM_NAMES
+    attr_lookup = {}
+    for attr_name, setting_name in PARAM_NAMES.items():
+        attr_lookup[setting_name] = attr_name
+    for setting_name, val in params.items():
+        attr_name = attr_lookup[setting_name]
+        if attr_name == 'protocol':
+            continue
+        assert hasattr(handler, attr_name)
+
+
+def test_invalid_kwarg_to_real_handler():
     settings = LazySettings()
     settings.configure(**{
-        django_settings_name: 'EXAMPLE'
+        'LOG_AGGREGATOR_HOST': 'https://server.invalid',
+        'LOG_AGGREGATOR_PORT': 22222,
+        'LOG_AGGREGATOR_PROTOCOL': 'udp',
+        'LOG_AGGREGATOR_VERIFY_CERT': False  # setting not valid for UDP handler
     })
-    handler = BaseHandler.from_django_settings(settings)
-    assert hasattr(handler, param) and getattr(handler, param) == 'EXAMPLE'
+    handler = AWXProxyHandler().get_handler(custom_settings=settings)
+    assert not hasattr(handler, 'verify_cert')
 
 
-@pytest.mark.parametrize('params, logger_name, expected', [
-    # skip all records if enabled_flag = False
-    ({'enabled_flag': False}, 'awx.main', True),
-    # skip all records if the host is undefined
-    ({'host': '', 'enabled_flag': True}, 'awx.main', True),
-    # skip all records if underlying logger is used by handlers themselves
-    ({'host': '127.0.0.1', 'enabled_flag': True}, 'awx.main.utils.handlers', True),
-    ({'host': '127.0.0.1', 'enabled_flag': True}, 'awx.main', False),
-    ({'host': '127.0.0.1', 'enabled_flag': True, 'enabled_loggers': ['abc']}, 'awx.analytics.xyz', True),
-    ({'host': '127.0.0.1', 'enabled_flag': True, 'enabled_loggers': ['xyz']}, 'awx.analytics.xyz', False),
-])
-def test_base_logging_handler_skip_log(params, logger_name, expected):
-    handler = BaseHandler(**params)
-    assert handler._skip_log(logger_name) is expected
-
-
-def test_base_logging_handler_emit(dummy_log_record):
-    handler = BaseHandler(host='127.0.0.1', enabled_flag=True,
-                          message_type='logstash', lvl='INFO',
-                          enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
+def test_base_logging_handler_emit_system_tracking(dummy_log_record):
+    handler = BaseHandler(host='127.0.0.1', indv_facts=True)
     handler.setFormatter(LogstashFormatter())
-    sent_payloads = handler.emit(dummy_log_record)
-
-    assert len(sent_payloads) == 1
-    body = json.loads(sent_payloads[0])
-
-    assert body['level'] == 'INFO'
-    assert body['logger_name'] == 'awx'
-    assert body['message'] == 'User joe logged in'
-
-
-def test_base_logging_handler_ignore_low_severity_msg(dummy_log_record):
-    handler = BaseHandler(host='127.0.0.1', enabled_flag=True,
-                          message_type='logstash', lvl='WARNING',
-                          enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
-    handler.setFormatter(LogstashFormatter())
-    sent_payloads = handler.emit(dummy_log_record)
-    assert len(sent_payloads) == 0
-
-
-def test_base_logging_handler_emit_system_tracking():
-    handler = BaseHandler(host='127.0.0.1', enabled_flag=True,
-                          message_type='logstash', indv_facts=True, lvl='INFO',
-                          enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
-    handler.setFormatter(LogstashFormatter())
-    record = logging.LogRecord(
-        'awx.analytics.system_tracking', # logger name
-        20, # loglevel INFO
-        './awx/some/module.py', # pathname
-        100, # lineno
-        None, # msg
-        tuple(), # args,
-        None # exc_info
-    )
-    record.inventory_id = 11
-    record.host_name = 'my_lucky_host'
-    record.job_id = 777
-    record.ansible_facts = {
+    dummy_log_record.name = 'awx.analytics.system_tracking'
+    dummy_log_record.msg = None
+    dummy_log_record.inventory_id = 11
+    dummy_log_record.host_name = 'my_lucky_host'
+    dummy_log_record.job_id = 777
+    dummy_log_record.ansible_facts = {
         "ansible_kernel": "4.4.66-boot2docker",
         "ansible_machine": "x86_64",
         "ansible_swapfree_mb": 4663,
     }
-    record.ansible_facts_modified = datetime.datetime.now(tzutc()).isoformat()
-    sent_payloads = handler.emit(record)
+    dummy_log_record.ansible_facts_modified = datetime.datetime.now(tzutc()).isoformat()
+    sent_payloads = handler.emit(dummy_log_record)
 
     assert len(sent_payloads) == 1
-    assert sent_payloads[0]['ansible_facts'] == record.ansible_facts
-    assert sent_payloads[0]['ansible_facts_modified'] == record.ansible_facts_modified
+    assert sent_payloads[0]['ansible_facts'] == dummy_log_record.ansible_facts
+    assert sent_payloads[0]['ansible_facts_modified'] == dummy_log_record.ansible_facts_modified
     assert sent_payloads[0]['level'] == 'INFO'
     assert sent_payloads[0]['logger_name'] == 'awx.analytics.system_tracking'
-    assert sent_payloads[0]['job_id'] == record.job_id
-    assert sent_payloads[0]['inventory_id'] == record.inventory_id
-    assert sent_payloads[0]['host_name'] == record.host_name
+    assert sent_payloads[0]['job_id'] == dummy_log_record.job_id
+    assert sent_payloads[0]['inventory_id'] == dummy_log_record.inventory_id
+    assert sent_payloads[0]['host_name'] == dummy_log_record.host_name
 
 
 @pytest.mark.parametrize('host, port, normalized, hostname_only', [
@@ -236,16 +208,18 @@ def test_https_logging_handler_connectivity_test(http_adapter, status, reason, e
         def emit(self, record):
             return super(FakeHTTPSHandler, self).emit(record)
 
-    if exc:
-        with pytest.raises(exc) as e:
-            FakeHTTPSHandler.perform_test(settings)
-        assert str(e).endswith('%s: %s' % (status, reason))
-    else:
-        assert FakeHTTPSHandler.perform_test(settings) is None
+    with mock.patch.object(AWXProxyHandler, 'get_handler_class') as mock_get_class:
+        mock_get_class.return_value = FakeHTTPSHandler
+        if exc:
+            with pytest.raises(exc) as e:
+                AWXProxyHandler().perform_test(settings)
+            assert str(e).endswith('%s: %s' % (status, reason))
+        else:
+            assert AWXProxyHandler().perform_test(settings) is None
 
 
 def test_https_logging_handler_logstash_auth_info():
-    handler = HTTPSHandler(message_type='logstash', username='bob', password='ansible', lvl='INFO')
+    handler = HTTPSHandler(message_type='logstash', username='bob', password='ansible')
     handler._add_auth_information()
     assert isinstance(handler.session.auth, requests.auth.HTTPBasicAuth)
     assert handler.session.auth.username == 'bob'
@@ -261,9 +235,7 @@ def test_https_logging_handler_splunk_auth_info():
 
 def test_https_logging_handler_connection_error(connection_error_adapter,
                                                 dummy_log_record):
-    handler = HTTPSHandler(host='127.0.0.1', enabled_flag=True,
-                           message_type='logstash', lvl='INFO',
-                           enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
+    handler = HTTPSHandler(host='127.0.0.1', message_type='logstash')
     handler.setFormatter(LogstashFormatter())
     handler.session.mount('http://', connection_error_adapter)
 
@@ -289,9 +261,7 @@ def test_https_logging_handler_connection_error(connection_error_adapter,
 @pytest.mark.parametrize('message_type', ['logstash', 'splunk'])
 def test_https_logging_handler_emit_without_cred(http_adapter, dummy_log_record,
                                                  message_type):
-    handler = HTTPSHandler(host='127.0.0.1', enabled_flag=True,
-                           message_type=message_type, lvl='INFO',
-                           enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
+    handler = HTTPSHandler(host='127.0.0.1', message_type=message_type)
     handler.setFormatter(LogstashFormatter())
     handler.session.mount('http://', http_adapter)
     async_futures = handler.emit(dummy_log_record)
@@ -312,10 +282,9 @@ def test_https_logging_handler_emit_without_cred(http_adapter, dummy_log_record,
 
 def test_https_logging_handler_emit_logstash_with_creds(http_adapter,
                                                         dummy_log_record):
-    handler = HTTPSHandler(host='127.0.0.1', enabled_flag=True,
+    handler = HTTPSHandler(host='127.0.0.1',
                            username='user', password='pass',
-                           message_type='logstash', lvl='INFO',
-                           enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
+                           message_type='logstash')
     handler.setFormatter(LogstashFormatter())
     handler.session.mount('http://', http_adapter)
     async_futures = handler.emit(dummy_log_record)
@@ -328,9 +297,8 @@ def test_https_logging_handler_emit_logstash_with_creds(http_adapter,
 
 def test_https_logging_handler_emit_splunk_with_creds(http_adapter,
                                                       dummy_log_record):
-    handler = HTTPSHandler(host='127.0.0.1', enabled_flag=True,
-                           password='pass', message_type='splunk', lvl='INFO',
-                           enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
+    handler = HTTPSHandler(host='127.0.0.1',
+                           password='pass', message_type='splunk')
     handler.setFormatter(LogstashFormatter())
     handler.session.mount('http://', http_adapter)
     async_futures = handler.emit(dummy_log_record)
@@ -351,9 +319,7 @@ def test_encode_payload_for_socket(payload, encoded_payload):
 
 
 def test_udp_handler_create_socket_at_init():
-    handler = UDPHandler(host='127.0.0.1', port=4399,
-                         enabled_flag=True, message_type='splunk', lvl='INFO',
-                         enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
+    handler = UDPHandler(host='127.0.0.1', port=4399)
     assert hasattr(handler, 'socket')
     assert isinstance(handler.socket, socket.socket)
     assert handler.socket.family == socket.AF_INET
@@ -361,9 +327,7 @@ def test_udp_handler_create_socket_at_init():
 
 
 def test_udp_handler_send(dummy_log_record):
-    handler = UDPHandler(host='127.0.0.1', port=4399,
-                         enabled_flag=True, message_type='splunk', lvl='INFO',
-                         enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
+    handler = UDPHandler(host='127.0.0.1', port=4399)
     handler.setFormatter(LogstashFormatter())
     with mock.patch('awx.main.utils.handlers._encode_payload_for_socket', return_value="des") as encode_mock,\
             mock.patch.object(handler, 'socket') as socket_mock:
@@ -373,9 +337,7 @@ def test_udp_handler_send(dummy_log_record):
 
 
 def test_tcp_handler_send(fake_socket, dummy_log_record):
-    handler = TCPHandler(host='127.0.0.1', port=4399, tcp_timeout=5,
-                         enabled_flag=True, message_type='splunk', lvl='INFO',
-                         enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
+    handler = TCPHandler(host='127.0.0.1', port=4399, tcp_timeout=5)
     handler.setFormatter(LogstashFormatter())
     with mock.patch('socket.socket', return_value=fake_socket) as sok_init_mock,\
             mock.patch('select.select', return_value=([], [fake_socket], [])):
@@ -388,9 +350,7 @@ def test_tcp_handler_send(fake_socket, dummy_log_record):
 
 
 def test_tcp_handler_return_if_socket_unavailable(fake_socket, dummy_log_record):
-    handler = TCPHandler(host='127.0.0.1', port=4399, tcp_timeout=5,
-                         enabled_flag=True, message_type='splunk', lvl='INFO',
-                         enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
+    handler = TCPHandler(host='127.0.0.1', port=4399, tcp_timeout=5)
     handler.setFormatter(LogstashFormatter())
     with mock.patch('socket.socket', return_value=fake_socket) as sok_init_mock,\
             mock.patch('select.select', return_value=([], [], [])):
@@ -403,9 +363,7 @@ def test_tcp_handler_return_if_socket_unavailable(fake_socket, dummy_log_record)
 
 
 def test_tcp_handler_log_exception(fake_socket, dummy_log_record):
-    handler = TCPHandler(host='127.0.0.1', port=4399, tcp_timeout=5,
-                         enabled_flag=True, message_type='splunk', lvl='INFO',
-                         enabled_loggers=['awx', 'activity_stream', 'job_events', 'system_tracking'])
+    handler = TCPHandler(host='127.0.0.1', port=4399, tcp_timeout=5)
     handler.setFormatter(LogstashFormatter())
     with mock.patch('socket.socket', return_value=fake_socket) as sok_init_mock,\
             mock.patch('select.select', return_value=([], [], [])),\
diff --git a/awx/main/tests/unit/utils/test_reload.py b/awx/main/tests/unit/utils/test_reload.py
index 6d09d6105b..1820f2724a 100644
--- a/awx/main/tests/unit/utils/test_reload.py
+++ b/awx/main/tests/unit/utils/test_reload.py
@@ -13,31 +13,3 @@ def test_produce_supervisor_command(mocker):
             ['supervisorctl', 'restart', 'tower-processes:receiver',],
             stderr=-1, stdin=-1, stdout=-1)
 
-
-def test_routing_of_service_restarts_works(mocker):
-    '''
-    This tests that the parent restart method will call the appropriate
-    service restart methods, depending on which services are given in args
-    '''
-    with mocker.patch.object(reload, '_uwsgi_fifo_command'),\
-            mocker.patch.object(reload, '_reset_celery_thread_pool'),\
-            mocker.patch.object(reload, '_supervisor_service_command'):
-        reload.restart_local_services(['uwsgi', 'celery', 'flower', 'daphne'])
-        reload._uwsgi_fifo_command.assert_called_once_with(uwsgi_command="c")
-        reload._reset_celery_thread_pool.assert_called_once_with()
-        reload._supervisor_service_command.assert_called_once_with(['flower', 'daphne'], command="restart")
-
-
-
-def test_routing_of_service_restarts_diables(mocker):
-    '''
-    Test that methods are not called if not in the args
-    '''
-    with mocker.patch.object(reload, '_uwsgi_fifo_command'),\
-            mocker.patch.object(reload, '_reset_celery_thread_pool'),\
-            mocker.patch.object(reload, '_supervisor_service_command'):
-        reload.restart_local_services(['flower'])
-        reload._uwsgi_fifo_command.assert_not_called()
-        reload._reset_celery_thread_pool.assert_not_called()
-        reload._supervisor_service_command.assert_called_once_with(['flower'], command="restart")
-
diff --git a/awx/main/utils/filters.py b/awx/main/utils/filters.py
index 81f91a0b0a..9563eb6c34 100644
--- a/awx/main/utils/filters.py
+++ b/awx/main/utils/filters.py
@@ -8,14 +8,106 @@ from pyparsing import (
     CharsNotIn,
     ParseException,
 )
+from logging import Filter, _levelNames
 
 import six
 
-import django
+from django.apps import apps
+from django.db import models
+from django.conf import settings
 
 from awx.main.utils.common import get_search_fields
 
-__all__ = ['SmartFilter']
+__all__ = ['SmartFilter', 'ExternalLoggerEnabled']
+
+
+class FieldFromSettings(object):
+    """
+    Field interface - defaults to getting value from setting
+    if otherwise set, provided value will take precedence
+        over value in settings
+    """
+
+    def __init__(self, setting_name):
+        self.setting_name = setting_name
+
+    def __get__(self, instance, type=None):
+        if self.setting_name in getattr(instance, 'settings_override', {}):
+            return instance.settings_override[self.setting_name]
+        return getattr(settings, self.setting_name, None)
+
+    def __set__(self, instance, value):
+        if value is None:
+            if hasattr(instance, 'settings_override'):
+                instance.settings_override.pop('instance', None)
+        else:
+            if not hasattr(instance, 'settings_override'):
+                instance.settings_override = {}
+            instance.settings_override[self.setting_name] = value
+
+
+class ExternalLoggerEnabled(Filter):
+
+    # Prevents recursive logging loops from swamping the server
+    LOGGER_BLACKLIST = (
+        # loggers that may be called in process of emitting a log
+        'awx.main.utils.handlers',
+        'awx.main.utils.formatters',
+        'awx.main.utils.filters',
+        'awx.main.utils.encryption',
+        'awx.main.utils.log',
+        # loggers that may be called getting logging settings
+        'awx.conf'
+    )
+
+    lvl = FieldFromSettings('LOG_AGGREGATOR_LEVEL')
+    enabled_loggers = FieldFromSettings('LOG_AGGREGATOR_LOGGERS')
+    enabled_flag = FieldFromSettings('LOG_AGGREGATOR_ENABLED')
+
+    def __init__(self, **kwargs):
+        super(ExternalLoggerEnabled, self).__init__()
+        for field_name, field_value in kwargs.items():
+            if not isinstance(ExternalLoggerEnabled.__dict__.get(field_name, None), FieldFromSettings):
+                raise Exception('%s is not a valid kwarg' % field_name)
+            if field_value is None:
+                continue
+            setattr(self, field_name, field_value)
+
+    def filter(self, record):
+        """
+        Uses the database settings to determine if the current
+        external log configuration says that this particular record
+        should be sent to the external log aggregator
+
+        False - should not be logged
+        True - should be logged
+        """
+        # Logger exceptions
+        for logger_name in self.LOGGER_BLACKLIST:
+            if record.name.startswith(logger_name):
+                return False
+        # General enablement
+        if not self.enabled_flag:
+            return False
+
+        # Level enablement
+        if record.levelno < _levelNames[self.lvl]:
+            # logging._levelNames -> logging._nameToLevel in python 3
+            return False
+
+        # Logger type enablement
+        loggers = self.enabled_loggers
+        if not loggers:
+            return False
+        if record.name.startswith('awx.analytics'):
+            base_path, headline_name = record.name.rsplit('.', 1)
+            return bool(headline_name in loggers)
+        else:
+            if '.' in record.name:
+                base_name, trailing_path = record.name.split('.', 1)
+            else:
+                base_name = record.name
+            return bool(base_name in loggers)
 
 
 def string_to_type(t):
@@ -36,7 +128,7 @@ def string_to_type(t):
 
 
 def get_model(name):
-    return django.apps.apps.get_model('main', name)
+    return apps.get_model('main', name)
 
 
 class SmartFilter(object):
@@ -52,7 +144,7 @@ class SmartFilter(object):
             search_kwargs = self._expand_search(k, v)
             if search_kwargs:
                 kwargs.update(search_kwargs)
-                q = reduce(lambda x, y: x | y, [django.db.models.Q(**{u'%s__contains' % _k:_v}) for _k, _v in kwargs.items()])
+                q = reduce(lambda x, y: x | y, [models.Q(**{u'%s__contains' % _k:_v}) for _k, _v in kwargs.items()])
                 self.result = Host.objects.filter(q)
             else:
                 kwargs[k] = v
diff --git a/awx/main/utils/formatters.py b/awx/main/utils/formatters.py
index c867912be4..f83dc3887c 100644
--- a/awx/main/utils/formatters.py
+++ b/awx/main/utils/formatters.py
@@ -9,6 +9,8 @@ import logging
 
 import six
 
+from django.conf import settings
+
 
 class TimeFormatter(logging.Formatter):
     '''
@@ -20,15 +22,6 @@ class TimeFormatter(logging.Formatter):
 
 
 class LogstashFormatter(LogstashFormatterVersion1):
-    def __init__(self, **kwargs):
-        settings_module = kwargs.pop('settings_module', None)
-        ret = super(LogstashFormatter, self).__init__(**kwargs)
-        if settings_module:
-            self.host_id = getattr(settings_module, 'CLUSTER_HOST_ID', None)
-            if hasattr(settings_module, 'LOG_AGGREGATOR_TOWER_UUID'):
-                self.tower_uuid = settings_module.LOG_AGGREGATOR_TOWER_UUID
-            self.message_type = getattr(settings_module, 'LOG_AGGREGATOR_TYPE', 'other')
-        return ret
 
     def reformat_data_for_log(self, raw_data, kind=None):
         '''
@@ -147,6 +140,15 @@ class LogstashFormatter(LogstashFormatterVersion1):
         if record.name.startswith('awx.analytics'):
             log_kind = record.name[len('awx.analytics.'):]
             fields = self.reformat_data_for_log(fields, kind=log_kind)
+        # General AWX metadata
+        for log_name, setting_name in [
+                ('type', 'LOG_AGGREGATOR_TYPE'),
+                ('cluster_host_id', 'CLUSTER_HOST_ID'),
+                ('tower_uuid', 'LOG_AGGREGATOR_TOWER_UUID')]:
+            if hasattr(settings, setting_name):
+                fields[log_name] = getattr(settings, setting_name, None)
+            elif log_name == 'type':
+                fields[log_name] = 'other'
         return fields
 
     def format(self, record):
@@ -158,18 +160,12 @@ class LogstashFormatter(LogstashFormatterVersion1):
             '@timestamp': self.format_timestamp(record.created),
             'message': record.getMessage(),
             'host': self.host,
-            'type': self.message_type,
 
             # Extra Fields
             'level': record.levelname,
             'logger_name': record.name,
         }
 
-        if getattr(self, 'tower_uuid', None):
-            message['tower_uuid'] = self.tower_uuid
-        if getattr(self, 'host_id', None):
-            message['cluster_host_id'] = self.host_id
-
         # Add extra fields
         message.update(self.get_extra_fields(record))
 
diff --git a/awx/main/utils/handlers.py b/awx/main/utils/handlers.py
index 8ed1127292..214c40ff11 100644
--- a/awx/main/utils/handlers.py
+++ b/awx/main/utils/handlers.py
@@ -13,40 +13,35 @@ import six
 from concurrent.futures import ThreadPoolExecutor
 from requests.exceptions import RequestException
 
-# loggly
-import traceback
-
+# Django
 from django.conf import settings
+
+# requests futures, a dependency used by these handlers
 from requests_futures.sessions import FuturesSession
 
 # AWX
 from awx.main.utils.formatters import LogstashFormatter
 
 
-__all__ = ['HTTPSNullHandler', 'BaseHTTPSHandler', 'TCPHandler', 'UDPHandler',
-           'configure_external_logger']
+__all__ = ['BaseHTTPSHandler', 'TCPHandler', 'UDPHandler',
+           'AWXProxyHandler']
 
 
 logger = logging.getLogger('awx.main.utils.handlers')
 
-# AWX external logging handler, generally designed to be used
-# with the accompanying LogstashHandler, derives from python-logstash library
-# Non-blocking request accomplished by FuturesSession, similar
-# to the loggly-python-handler library (not used)
 
 # Translation of parameter names to names in Django settings
+# logging settings category, only those related to handler / log emission
 PARAM_NAMES = {
     'host': 'LOG_AGGREGATOR_HOST',
     'port': 'LOG_AGGREGATOR_PORT',
     'message_type': 'LOG_AGGREGATOR_TYPE',
     'username': 'LOG_AGGREGATOR_USERNAME',
     'password': 'LOG_AGGREGATOR_PASSWORD',
-    'enabled_loggers': 'LOG_AGGREGATOR_LOGGERS',
     'indv_facts': 'LOG_AGGREGATOR_INDIVIDUAL_FACTS',
-    'enabled_flag': 'LOG_AGGREGATOR_ENABLED',
     'tcp_timeout': 'LOG_AGGREGATOR_TCP_TIMEOUT',
     'verify_cert': 'LOG_AGGREGATOR_VERIFY_CERT',
-    'lvl': 'LOG_AGGREGATOR_LEVEL',
+    'protocol': 'LOG_AGGREGATOR_PROTOCOL'
 }
 
 
@@ -58,13 +53,6 @@ class LoggingConnectivityException(Exception):
     pass
 
 
-class HTTPSNullHandler(logging.NullHandler):
-    "Placeholder null handler to allow loading without database access"
-
-    def __init__(self, *args, **kwargs):
-        return super(HTTPSNullHandler, self).__init__()
-
-
 class VerboseThreadPoolExecutor(ThreadPoolExecutor):
 
     last_log_emit = 0
@@ -91,32 +79,25 @@ class VerboseThreadPoolExecutor(ThreadPoolExecutor):
                                                              **kwargs)
 
 
-LEVEL_MAPPING = {
-    'DEBUG': logging.DEBUG,
-    'INFO': logging.INFO,
-    'WARNING': logging.WARNING,
-    'ERROR': logging.ERROR,
-    'CRITICAL': logging.CRITICAL,
-}
+class SocketResult:
+    '''
+    A class to be the return type of methods that send data over a socket
+    allows object to be used in the same way as a request futures object
+    '''
+    def __init__(self, ok, reason=None):
+        self.ok = ok
+        self.reason = reason
+
+    def result(self):
+        return self
 
 
 class BaseHandler(logging.Handler):
-    def __init__(self, **kwargs):
+    def __init__(self, host=None, port=None, indv_facts=None, **kwargs):
         super(BaseHandler, self).__init__()
-        for fd in PARAM_NAMES:
-            setattr(self, fd, kwargs.get(fd, None))
-
-    @classmethod
-    def from_django_settings(cls, settings, *args, **kwargs):
-        for param, django_setting_name in PARAM_NAMES.items():
-            kwargs[param] = getattr(settings, django_setting_name, None)
-        return cls(*args, **kwargs)
-
-    def get_full_message(self, record):
-        if record.exc_info:
-            return '\n'.join(traceback.format_exception(*record.exc_info))
-        else:
-            return record.getMessage()
+        self.host = host
+        self.port = port
+        self.indv_facts = indv_facts
 
     def _send(self, payload):
         """Actually send message to log aggregator.
@@ -128,26 +109,11 @@ class BaseHandler(logging.Handler):
             return [self._send(json.loads(self.format(record)))]
         return [self._send(self.format(record))]
 
-    def _skip_log(self, logger_name):
-        if self.host == '' or (not self.enabled_flag):
-            return True
-        # Don't send handler-related records.
-        if logger_name == logger.name:
-            return True
-        # AWX log emission is only turned off by enablement setting
-        if not logger_name.startswith('awx.analytics'):
-            return False
-        return self.enabled_loggers is None or logger_name[len('awx.analytics.'):] not in self.enabled_loggers
-
     def emit(self, record):
         """
             Emit a log record.  Returns a list of zero or more
             implementation-specific objects for tests.
         """
-        if not record.name.startswith('awx.analytics') and record.levelno < LEVEL_MAPPING[self.lvl]:
-            return []
-        if self._skip_log(record.name):
-            return []
         try:
             return self._format_and_send_record(record)
         except (KeyboardInterrupt, SystemExit):
@@ -181,6 +147,11 @@ class BaseHandler(logging.Handler):
 
 
 class BaseHTTPSHandler(BaseHandler):
+    '''
+    Originally derived from python-logstash library
+    Non-blocking request accomplished by FuturesSession, similar
+    to the loggly-python-handler library
+    '''
     def _add_auth_information(self):
         if self.message_type == 'logstash':
             if not self.username:
@@ -196,39 +167,20 @@ class BaseHTTPSHandler(BaseHandler):
             }
             self.session.headers.update(headers)
 
-    def __init__(self, fqdn=False, **kwargs):
+    def __init__(self, fqdn=False, message_type=None, username=None, password=None,
+                 tcp_timeout=5, verify_cert=True, **kwargs):
         self.fqdn = fqdn
+        self.message_type = message_type
+        self.username = username
+        self.password = password
+        self.tcp_timeout = tcp_timeout
+        self.verify_cert = verify_cert
         super(BaseHTTPSHandler, self).__init__(**kwargs)
         self.session = FuturesSession(executor=VerboseThreadPoolExecutor(
             max_workers=2  # this is the default used by requests_futures
         ))
         self._add_auth_information()
 
-    @classmethod
-    def perform_test(cls, settings):
-        """
-        Tests logging connectivity for the current logging settings.
-        @raises LoggingConnectivityException
-        """
-        handler = cls.from_django_settings(settings)
-        handler.enabled_flag = True
-        handler.setFormatter(LogstashFormatter(settings_module=settings))
-        logger = logging.getLogger(__file__)
-        fn, lno, func = logger.findCaller()
-        record = logger.makeRecord('awx', 10, fn, lno,
-                                   'AWX Connection Test', tuple(),
-                                   None, func)
-        futures = handler.emit(record)
-        for future in futures:
-            try:
-                resp = future.result()
-                if not resp.ok:
-                    raise LoggingConnectivityException(
-                        ': '.join([str(resp.status_code), resp.reason or ''])
-                    )
-            except RequestException as e:
-                raise LoggingConnectivityException(str(e))
-
     def _get_post_kwargs(self, payload_input):
         if self.message_type == 'splunk':
             # Splunk needs data nested under key "event"
@@ -265,6 +217,10 @@ def _encode_payload_for_socket(payload):
 
 
 class TCPHandler(BaseHandler):
+    def __init__(self, tcp_timeout=5, **kwargs):
+        self.tcp_timeout = tcp_timeout
+        super(TCPHandler, self).__init__(**kwargs)
+
     def _send(self, payload):
         payload = _encode_payload_for_socket(payload)
         sok = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -273,39 +229,32 @@ class TCPHandler(BaseHandler):
             sok.setblocking(0)
             _, ready_to_send, _ = select.select([], [sok], [], float(self.tcp_timeout))
             if len(ready_to_send) == 0:
-                logger.warning("Socket currently busy, failed to send message")
-                sok.close()
-                return
-            sok.send(payload)
+                ret = SocketResult(False, "Socket currently busy, failed to send message")
+                logger.warning(ret.reason)
+            else:
+                sok.send(payload)
+                ret = SocketResult(True)  # success!
         except Exception as e:
-            logger.exception("Error sending message from %s: %s" %
-                             (TCPHandler.__name__, e.message))
-        sok.close()
+            ret = SocketResult(False, "Error sending message from %s: %s" %
+                               (TCPHandler.__name__,
+                                ' '.join(six.text_type(arg) for arg in e.args)))
+            logger.exception(ret.reason)
+        finally:
+            sok.close()
+        return ret
 
 
 class UDPHandler(BaseHandler):
+    message = "Cannot determine if UDP messages are received."
+
     def __init__(self, **kwargs):
         super(UDPHandler, self).__init__(**kwargs)
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
 
     def _send(self, payload):
         payload = _encode_payload_for_socket(payload)
-        return self.socket.sendto(payload, (self._get_host(hostname_only=True), self.port or 0))
-
-    @classmethod
-    def perform_test(cls, settings):
-        """
-        Tests logging connectivity for the current logging settings.
-        """
-        handler = cls.from_django_settings(settings)
-        handler.enabled_flag = True
-        handler.setFormatter(LogstashFormatter(settings_module=settings))
-        logger = logging.getLogger(__file__)
-        fn, lno, func = logger.findCaller()
-        record = logger.makeRecord('awx', 10, fn, lno,
-                                   'AWX Connection Test', tuple(),
-                                   None, func)
-        handler.emit(_encode_payload_for_socket(record))
+        self.socket.sendto(payload, (self._get_host(hostname_only=True), self.port or 0))
+        return SocketResult(True, reason=self.message)
 
 
 HANDLER_MAPPING = {
@@ -315,6 +264,88 @@ HANDLER_MAPPING = {
 }
 
 
+class AWXProxyHandler(logging.Handler):
+    '''
+    Handler specific to the AWX external logging feature
+
+    Will dynamically create a handler specific to the configured
+    protocol, and will create a new one automatically on setting change
+
+    Managing parameters:
+    All parameters will get their value from settings as a default
+    if the parameter was either provided on init, or set manually,
+    this value will take precedence.
+    Parameters match same parameters in the actualized handler classes.
+    '''
+
+    def __init__(self, **kwargs):
+        # TODO: process 'level' kwarg
+        super(AWXProxyHandler, self).__init__(**kwargs)
+        self._handler = None
+        self._old_kwargs = {}
+
+    def get_handler_class(self, protocol):
+        return HANDLER_MAPPING[protocol]
+
+    def get_handler(self, custom_settings=None, force_create=False):
+        new_kwargs = {}
+        use_settings = custom_settings or settings
+        for field_name, setting_name in PARAM_NAMES.items():
+            val = getattr(use_settings, setting_name, None)
+            if val is None:
+                continue
+            new_kwargs[field_name] = val
+        if new_kwargs == self._old_kwargs and self._handler and (not force_create):
+            # avoids re-creating session objects, and other such things
+            return self._handler
+        self._old_kwargs = new_kwargs.copy()
+        # TODO: remove any kwargs no applicable to that particular handler
+        protocol = new_kwargs.pop('protocol', None)
+        HandlerClass = self.get_handler_class(protocol)
+        # cleanup old handler and make new one
+        if self._handler:
+            self._handler.close()
+        logger.debug('Creating external log handler due to startup or settings change.')
+        self._handler = HandlerClass(**new_kwargs)
+        if self.formatter:
+            # self.format(record) is called inside of emit method
+            # so not safe to assume this can be handled within self
+            self._handler.setFormatter(self.formatter)
+        return self._handler
+
+    def emit(self, record):
+        actual_handler = self.get_handler()
+        return actual_handler.emit(record)
+
+    def perform_test(self, custom_settings):
+        """
+        Tests logging connectivity for given settings module.
+        @raises LoggingConnectivityException
+        """
+        handler = self.get_handler(custom_settings=custom_settings, force_create=True)
+        handler.setFormatter(LogstashFormatter())
+        logger = logging.getLogger(__file__)
+        fn, lno, func = logger.findCaller()
+        record = logger.makeRecord('awx', 10, fn, lno,
+                                   'AWX Connection Test', tuple(),
+                                   None, func)
+        futures = handler.emit(record)
+        for future in futures:
+            try:
+                resp = future.result()
+                if not resp.ok:
+                    if isinstance(resp, SocketResult):
+                        raise LoggingConnectivityException(
+                            'Socket error: {}'.format(resp.reason or '')
+                        )
+                    else:
+                        raise LoggingConnectivityException(
+                            ': '.join([str(resp.status_code), resp.reason or ''])
+                        )
+            except RequestException as e:
+                raise LoggingConnectivityException(str(e))
+
+
 ColorHandler = logging.StreamHandler
 
 if settings.COLOR_LOGS is True:
@@ -340,41 +371,3 @@ if settings.COLOR_LOGS is True:
     except ImportError:
         # logutils is only used for colored logs in the dev environment
         pass
-
-
-def _add_or_remove_logger(address, instance):
-    specific_logger = logging.getLogger(address)
-    for i, handler in enumerate(specific_logger.handlers):
-        if isinstance(handler, (HTTPSNullHandler, BaseHTTPSHandler)):
-            specific_logger.handlers[i] = instance or HTTPSNullHandler()
-            break
-    else:
-        if instance is not None:
-            specific_logger.handlers.append(instance)
-
-
-def configure_external_logger(settings_module, is_startup=True):
-    is_enabled = settings_module.LOG_AGGREGATOR_ENABLED
-    if is_startup and (not is_enabled):
-        # Pass-through if external logging not being used
-        return
-
-    instance = None
-    if is_enabled:
-        handler_class = HANDLER_MAPPING[settings_module.LOG_AGGREGATOR_PROTOCOL]
-        instance = handler_class.from_django_settings(settings_module)
-
-        # Obtain the Formatter class from settings to maintain customizations
-        configurator = logging.config.DictConfigurator(settings_module.LOGGING)
-        formatter_config = settings_module.LOGGING['formatters']['json'].copy()
-        formatter_config['settings_module'] = settings_module
-        formatter = configurator.configure_custom(formatter_config)
-
-        instance.setFormatter(formatter)
-
-    awx_logger_instance = instance
-    if is_enabled and 'awx' not in settings_module.LOG_AGGREGATOR_LOGGERS:
-        awx_logger_instance = None
-
-    _add_or_remove_logger('awx.analytics', instance)
-    _add_or_remove_logger('awx', awx_logger_instance)
diff --git a/awx/main/utils/reload.py b/awx/main/utils/reload.py
index 6da8b0b4f7..8da1fb0096 100644
--- a/awx/main/utils/reload.py
+++ b/awx/main/utils/reload.py
@@ -8,29 +8,9 @@ import logging
 # Django
 from django.conf import settings
 
-# Celery
-from celery import Celery
-
 logger = logging.getLogger('awx.main.utils.reload')
 
 
-def _uwsgi_fifo_command(uwsgi_command):
-    # http://uwsgi-docs.readthedocs.io/en/latest/MasterFIFO.html#available-commands
-    logger.warn('Initiating uWSGI chain reload of server')
-    TRIGGER_COMMAND = uwsgi_command
-    with open(settings.UWSGI_FIFO_LOCATION, 'w') as awxfifo:
-        awxfifo.write(TRIGGER_COMMAND)
-
-
-def _reset_celery_thread_pool():
-    # Do not use current_app because of this outstanding issue:
-    # https://github.com/celery/celery/issues/4410
-    app = Celery('awx')
-    app.config_from_object('django.conf:settings')
-    app.control.broadcast('pool_restart', arguments={'reload': True},
-                          destination=['celery@{}'.format(settings.CLUSTER_HOST_ID)], reply=False)
-
-
 def _supervisor_service_command(service_internal_names, command, communicate=True):
     '''
     Service internal name options:
@@ -68,21 +48,6 @@ def _supervisor_service_command(service_internal_names, command, communicate=Tru
         logger.info('Submitted supervisorctl {} command, not waiting for result'.format(command))
 
 
-def restart_local_services(service_internal_names):
-    logger.warn('Restarting services {} on this node in response to user action'.format(service_internal_names))
-    if 'uwsgi' in service_internal_names:
-        _uwsgi_fifo_command(uwsgi_command='c')
-        service_internal_names.remove('uwsgi')
-    restart_celery = False
-    if 'celery' in service_internal_names:
-        restart_celery = True
-        service_internal_names.remove('celery')
-    _supervisor_service_command(service_internal_names, command='restart')
-    if restart_celery:
-        # Celery restarted last because this probably includes current process
-        _reset_celery_thread_pool()
-
-
 def stop_local_services(service_internal_names, communicate=True):
     logger.warn('Stopping services {} on this node in response to user action'.format(service_internal_names))
     _supervisor_service_command(service_internal_names, command='stop', communicate=communicate)
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 20c8a82a1f..4a7fc96358 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -1001,6 +1001,9 @@ LOGGING = {
         'require_debug_true_or_test': {
             '()': 'awx.main.utils.RequireDebugTrueOrTest',
         },
+        'external_log_enabled': {
+            '()': 'awx.main.utils.filters.ExternalLoggerEnabled'
+        },
     },
     'formatters': {
         'simple': {
@@ -1034,11 +1037,10 @@ LOGGING = {
             'class': 'logging.NullHandler',
             'formatter': 'simple',
         },
-        'http_receiver': {
-            'class': 'awx.main.utils.handlers.HTTPSNullHandler',
-            'level': 'DEBUG',
+        'external_logger': {
+            'class': 'awx.main.utils.handlers.AWXProxyHandler',
             'formatter': 'json',
-            'host': '',
+            'filters': ['external_log_enabled'],
         },
         'mail_admins': {
             'level': 'ERROR',
@@ -1131,7 +1133,7 @@ LOGGING = {
             'handlers': ['console'],
         },
         'awx': {
-            'handlers': ['console', 'file', 'tower_warnings'],
+            'handlers': ['console', 'file', 'tower_warnings', 'external_logger'],
             'level': 'DEBUG',
         },
         'awx.conf': {
@@ -1179,7 +1181,7 @@ LOGGING = {
             'propagate': False,
         },
         'awx.analytics': {
-            'handlers': ['http_receiver'],
+            'handlers': ['external_logger'],
             'level': 'INFO',
             'propagate': False
         },
diff --git a/awx/settings/development.py b/awx/settings/development.py
index eec3689ee7..9f1d916bc0 100644
--- a/awx/settings/development.py
+++ b/awx/settings/development.py
@@ -149,8 +149,6 @@ SERVICE_NAME_DICT = {
     "uwsgi": "uwsgi",
     "daphne": "daphne",
     "nginx": "nginx"}
-# Used for sending commands in automatic restart
-UWSGI_FIFO_LOCATION = '/awxfifo'
 
 try:
     socket.gethostbyname('docker.for.mac.internal')
diff --git a/awx/settings/production.py b/awx/settings/production.py
index d1d5baa3ad..ff7d966138 100644
--- a/awx/settings/production.py
+++ b/awx/settings/production.py
@@ -68,8 +68,6 @@ SERVICE_NAME_DICT = {
     "channels": "awx-channels-worker",
     "uwsgi": "awx-uwsgi",
     "daphne": "awx-daphne"}
-# Used for sending commands in automatic restart
-UWSGI_FIFO_LOCATION = '/var/lib/awx/awxfifo'
 
 # Store a snapshot of default settings at this point before loading any
 # customizable config files.

From d8a1b78316559d94b0d42da48945138895eeb5ee Mon Sep 17 00:00:00 2001
From: Ben Thomasson <bthomass@redhat.com>
Date: Mon, 30 Apr 2018 13:55:24 -0400
Subject: [PATCH 037/169] Adds authentication checking to the network UI
 websocket.

Adds user authentication checking to the websocket connect
callback function. This prevents unauthenicated users
from making changes to the network canvas or viewing the
data on the canvas by getting snapshots of the diagram.
---
 awx/network_ui/consumers.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/awx/network_ui/consumers.py b/awx/network_ui/consumers.py
index 36cbb24803..43b0f52005 100644
--- a/awx/network_ui/consumers.py
+++ b/awx/network_ui/consumers.py
@@ -1,6 +1,6 @@
 # Copyright (c) 2017 Red Hat, Inc
 from channels import Group
-from channels.sessions import channel_session
+from channels.auth import channel_session_user, channel_session_user_from_http
 from awx.network_ui.models import Topology, Device, Link, Client, Interface
 from awx.network_ui.models import TopologyInventory
 import urlparse
@@ -189,8 +189,15 @@ class NetworkingEvents(object):
 networking_events_dispatcher = NetworkingEvents()
 
 
-@channel_session
+@channel_session_user_from_http
 def ws_connect(message):
+    if not message.user.is_authenticated():
+        logger.error("Request user is not authenticated to use websocket.")
+        message.reply_channel.send({"close": True})
+        return
+    else:
+        message.reply_channel.send({"accept": True})
+
     data = urlparse.parse_qs(message.content['query_string'])
     inventory_id = parse_inventory_id(data)
     topology_ids = list(TopologyInventory.objects.filter(inventory_id=inventory_id).values_list('pk', flat=True))
@@ -268,7 +275,7 @@ def send_snapshot(channel, topology_id):
     channel.send({"text": json.dumps(["Snapshot", snapshot])})
 
 
-@channel_session
+@channel_session_user
 def ws_message(message):
     # Send to all clients editing the topology
     Group("topology-%s" % message.channel_session['topology_id']).send({"text": message['text']})
@@ -278,7 +285,7 @@ def ws_message(message):
                                          "client": message.channel_session['client_id']})
 
 
-@channel_session
+@channel_session_user
 def ws_disconnect(message):
     if 'topology_id' in message.channel_session:
         Group("topology-%s" % message.channel_session['topology_id']).discard(message.reply_channel)

From 89cabf7ca05c2b748a548143b911dca1e4a8ad7d Mon Sep 17 00:00:00 2001
From: Ben Thomasson <bthomass@redhat.com>
Date: Tue, 1 May 2018 17:51:09 -0400
Subject: [PATCH 038/169] Fixes timeout when exporting YAML from network UI

Exporting YAML on dev envs with honcho and in production environments
would timeout.  This was due to daphne handling the export request
in dev but not in production.  This fixes network_ui to use uwsgi instead
of daphne to handle the request.
---
 awx/network_ui/routing.py                  |  6 +++---
 awx/network_ui/urls.py                     |  4 ++--
 awx/network_ui/views.py                    | 13 +++++++++----
 docs/networking.md                         |  2 +-
 tools/docker-compose/nginx.vh.default.conf |  4 ++--
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/awx/network_ui/routing.py b/awx/network_ui/routing.py
index 66553e23d2..0a9d07635d 100644
--- a/awx/network_ui/routing.py
+++ b/awx/network_ui/routing.py
@@ -3,7 +3,7 @@ from channels.routing import route
 from awx.network_ui.consumers import ws_connect, ws_message, ws_disconnect
 
 channel_routing = [
-    route("websocket.connect", ws_connect, path=r"^/network_ui/topology"),
-    route("websocket.receive", ws_message, path=r"^/network_ui/topology"),
-    route("websocket.disconnect", ws_disconnect, path=r"^/network_ui/topology"),
+    route("websocket.connect", ws_connect, path=r"^/network_ui/topology/"),
+    route("websocket.receive", ws_message, path=r"^/network_ui/topology/"),
+    route("websocket.disconnect", ws_disconnect, path=r"^/network_ui/topology/"),
 ]
diff --git a/awx/network_ui/urls.py b/awx/network_ui/urls.py
index d08b0a448a..2101eff59f 100644
--- a/awx/network_ui/urls.py
+++ b/awx/network_ui/urls.py
@@ -5,6 +5,6 @@ from awx.network_ui import views
 
 app_name = 'network_ui'
 urlpatterns = [
-    url(r'^topology.json$', views.json_topology_data, name='json_topology_data'),
-    url(r'^topology.yaml$', views.yaml_topology_data, name='yaml_topology_data'),
+    url(r'^topology.json/?$', views.json_topology_data, name='json_topology_data'),
+    url(r'^topology.yaml/?$', views.yaml_topology_data, name='yaml_topology_data'),
 ]
diff --git a/awx/network_ui/views.py b/awx/network_ui/views.py
index e80f03c320..577b8c004f 100644
--- a/awx/network_ui/views.py
+++ b/awx/network_ui/views.py
@@ -82,7 +82,10 @@ class TopologyForm(forms.Form):
 def json_topology_data(request):
     form = TopologyForm(request.GET)
     if form.is_valid():
-        return JsonResponse(topology_data(form.cleaned_data['topology_id']))
+        response = JsonResponse(topology_data(form.cleaned_data['topology_id']),
+                                content_type='application/force-download')
+        response['Content-Disposition'] = 'attachment; filename="{}"'.format('topology.json')
+        return response
     else:
         return HttpResponseBadRequest(form.errors)
 
@@ -90,9 +93,11 @@ def json_topology_data(request):
 def yaml_topology_data(request):
     form = TopologyForm(request.GET)
     if form.is_valid():
-        return HttpResponse(yaml.safe_dump(topology_data(form.cleaned_data['topology_id']),
-                                           default_flow_style=False),
-                            content_type='application/yaml')
+        response = HttpResponse(yaml.safe_dump(topology_data(form.cleaned_data['topology_id']),
+                                               default_flow_style=False),
+                                content_type='application/force-download')
+        response['Content-Disposition'] = 'attachment; filename="{}"'.format('topology.yaml')
+        return response
     else:
         return HttpResponseBadRequest(form.errors)
 
diff --git a/docs/networking.md b/docs/networking.md
index 79accfef9b..1334b45395 100644
--- a/docs/networking.md
+++ b/docs/networking.md
@@ -615,7 +615,7 @@ and for interaction performance on the UI.
 Messages
 --------
 
-JSON messages are passed over the `/network_ui/topology` websocket between the
+JSON messages are passed over the `/network_ui/topology/` websocket between the
 test client and the test server.  The protocol that is used for all messages is
 in ABNF (RFC5234):
 
diff --git a/tools/docker-compose/nginx.vh.default.conf b/tools/docker-compose/nginx.vh.default.conf
index e8c26e732a..5e31bce2ee 100644
--- a/tools/docker-compose/nginx.vh.default.conf
+++ b/tools/docker-compose/nginx.vh.default.conf
@@ -30,7 +30,7 @@ server {
         sendfile off;
     }
 
-    location ~ ^/(websocket|network_ui) {
+    location ~ ^/(websocket|network_ui/topology/) {
         # Pass request to the upstream alias
         proxy_pass http://daphne;
         # Require http version 1.1 to allow for upgrade requests
@@ -90,7 +90,7 @@ server {
         sendfile off;
     }
 
-    location ~ ^/(websocket|network_ui) {
+    location ~ ^/(websocket|network_ui/topology/) {
         # Pass request to the upstream alias
         proxy_pass http://daphne;
         # Require http version 1.1 to allow for upgrade requests

From 7007e46b8a5c9d59e0e8ec26d367aa088ff0ba6c Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Wed, 2 May 2018 09:36:22 -0400
Subject: [PATCH 039/169] Remove add button dropdown gap and update border
 radius

* Fix linting error
---
 awx/ui/client/features/templates/templatesList.view.html     | 1 +
 awx/ui/client/lib/components/list/_index.less                | 5 ++++-
 awx/ui/client/lib/theme/_global.less                         | 5 +++++
 .../src/shared/list-generator/list-actions.partial.html      | 2 +-
 awx/ui/test/e2e/objects/templates.js                         | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/features/templates/templatesList.view.html b/awx/ui/client/features/templates/templatesList.view.html
index 2608a04177..5a00912663 100644
--- a/awx/ui/client/features/templates/templatesList.view.html
+++ b/awx/ui/client/features/templates/templatesList.view.html
@@ -19,6 +19,7 @@
                 data-toggle="dropdown"
                 aria-haspopup="true"
                 aria-expanded="false">
+                <span class="sr-only">Toggle Dropdown</span>
             </button>
             <ul class="dropdown-menu at-List-toolbarActionDropdownMenu">
                 <li>
diff --git a/awx/ui/client/lib/components/list/_index.less b/awx/ui/client/lib/components/list/_index.less
index 5e05d07c69..9154e93a5e 100644
--- a/awx/ui/client/lib/components/list/_index.less
+++ b/awx/ui/client/lib/components/list/_index.less
@@ -46,9 +46,12 @@
 }
 
 .at-List-toolbarActionDropdownMenu {
+    border-top-right-radius: 0;
+    border: 1px solid @at-gray-d7;
     float: right;
-    right: 0;
     left: auto;
+    margin: 0;
+    right: 0;
 }
 
 .at-List-container {
diff --git a/awx/ui/client/lib/theme/_global.less b/awx/ui/client/lib/theme/_global.less
index b172089c23..a06e58dfb3 100644
--- a/awx/ui/client/lib/theme/_global.less
+++ b/awx/ui/client/lib/theme/_global.less
@@ -26,6 +26,11 @@
     border: none;
     display: flex;
     margin-left: @at-space-4x;
+
+    &[aria-expanded="true"] {
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+    }
 }
 
 .at-Button--info {
diff --git a/awx/ui/client/src/shared/list-generator/list-actions.partial.html b/awx/ui/client/src/shared/list-generator/list-actions.partial.html
index 2c937334b0..7581e3195d 100644
--- a/awx/ui/client/src/shared/list-generator/list-actions.partial.html
+++ b/awx/ui/client/src/shared/list-generator/list-actions.partial.html
@@ -35,7 +35,7 @@
                 <span  ng-bind-html="options.buttonContent" translate></span>
                 <span class="sr-only">Toggle Dropdown</span>
             </button>
-            <ul class="dropdown-menu pull-right">
+            <ul class="dropdown-menu at-List-toolbarActionDropdownMenu">
                 <li ng-repeat="option in options.options">
                     <a ui-sref="{{option.optionSref}}" ng-bind-html="option.optionContent" ng-show="{{option.ngShow}}"></a>
                 </li>
diff --git a/awx/ui/test/e2e/objects/templates.js b/awx/ui/test/e2e/objects/templates.js
index 5ab6025dd6..062d62c0ce 100644
--- a/awx/ui/test/e2e/objects/templates.js
+++ b/awx/ui/test/e2e/objects/templates.js
@@ -127,7 +127,7 @@ module.exports = {
             return this;
         },
         selectAdd (name) {
-            this.clickWhenEnabled(`#button-add`);
+            this.clickWhenEnabled('#button-add');
 
             this.api
                 .useXpath()

From 652f8376225ba3c42e710beac21d3d34ab9ba318 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Wed, 2 May 2018 11:37:38 -0400
Subject: [PATCH 040/169] update access check to plural creds

---
 awx/main/access.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/main/access.py b/awx/main/access.py
index ef2577d695..edec428f62 100644
--- a/awx/main/access.py
+++ b/awx/main/access.py
@@ -1924,7 +1924,7 @@ class WorkflowJobAccess(BaseAccess):
         return self.can_recreate(obj)
 
     def can_recreate(self, obj):
-        node_qs = obj.workflow_job_nodes.all().prefetch_related('inventory', 'credential', 'unified_job_template')
+        node_qs = obj.workflow_job_nodes.all().prefetch_related('inventory', 'credentials', 'unified_job_template')
         node_access = WorkflowJobNodeAccess(user=self.user)
         wj_add_perm = True
         for node in node_qs:

From 30af0a1b448653bd592401a3b27c9e10bf66c375 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 1 May 2018 13:18:11 -0400
Subject: [PATCH 041/169] don't run scheduled jobs if there isn't a valid
 license

---
 awx/main/tasks.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 22e6dff090..d7f0609e5f 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -49,6 +49,7 @@ from crum import impersonate
 # AWX
 from awx import __version__ as awx_application_version
 from awx.main.constants import CLOUD_PROVIDERS, PRIVILEGE_ESCALATION_METHODS
+from awx.main.access import access_registry
 from awx.main.models import * # noqa
 from awx.main.constants import ACTIVE_STATES
 from awx.main.exceptions import AwxTaskError
@@ -65,6 +66,9 @@ from awx.main.utils.ha import update_celery_worker_routes, register_celery_worke
 from awx.main.consumers import emit_channel_notification
 from awx.conf import settings_registry
 
+from rest_framework.exceptions import PermissionDenied
+
+
 __all__ = ['RunJob', 'RunSystemJob', 'RunProjectUpdate', 'RunInventoryUpdate',
            'RunAdHocCommand', 'handle_work_error', 'handle_work_success', 'apply_cluster_membership_policies',
            'update_inventory_computed_fields', 'update_host_smart_inventory_memberships',
@@ -410,6 +414,13 @@ def awx_periodic_scheduler(self):
     for schedule in old_schedules:
         schedule.save()
     schedules = Schedule.objects.enabled().between(last_run, run_now)
+
+    invalid_license = False
+    try:
+        access_registry[Job](None).check_license()
+    except PermissionDenied as e:
+        invalid_license = e
+
     for schedule in schedules:
         template = schedule.unified_job_template
         schedule.save() # To update next_run timestamp.
@@ -419,6 +430,13 @@ def awx_periodic_scheduler(self):
         try:
             job_kwargs = schedule.get_job_kwargs()
             new_unified_job = schedule.unified_job_template.create_unified_job(**job_kwargs)
+
+            if invalid_license:
+                new_unified_job.status = 'failed'
+                new_unified_job.job_explanation = str(invalid_license)
+                new_unified_job.save(update_fields=['status', 'job_explanation'])
+                new_unified_job.websocket_emit_status("failed")
+                raise invalid_license
             can_start = new_unified_job.signal_start()
         except Exception:
             logger.exception('Error spawning scheduled job.')

From 38885580b4a946b88a39c5e9b48212c667bb9833 Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Wed, 2 May 2018 12:32:08 -0400
Subject: [PATCH 042/169] only require the name field when creating instance
 group

---
 awx/api/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 551940f24e..64b709d056 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -4599,7 +4599,7 @@ class InstanceGroupSerializer(BaseSerializer):
                     "this group when new instances come online.")
     )
     policy_instance_list = serializers.ListField(
-        child=serializers.CharField(),
+        child=serializers.CharField(), required=False,
         help_text=_("List of exact-match Instances that will be assigned to this group")
     )
 

From 9f745dd3b87896660513c60e207639eb954fda7d Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Tue, 1 May 2018 15:19:47 -0400
Subject: [PATCH 043/169] control celery routes using celery router

* Each time a route is needed (i.e. when a task is sumitted to celery).
The router will be queried. This is ideal. With the previous method we
had to consider how a change in the routes would propogate to all celery
workers and nodes.

* fully describe the default awx queue
* Our dynamic queue registration would correct awx_private_queue.
However, we don't want celery to even create an "invalid"/extra
queue-exchange-route. This change makes sure we don't create extranious
things in rabbitmq.

* reduce the cluster queue registration output. Only output when the
queue registration list changes.
---
 awx/main/tasks.py                    | 29 ++++++----------------
 awx/main/tests/unit/utils/test_ha.py | 36 ++++++++++------------------
 awx/main/utils/ha.py                 | 31 +++++++++++-------------
 awx/settings/defaults.py             |  5 +++-
 4 files changed, 37 insertions(+), 64 deletions(-)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 22e6dff090..1e765dd709 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -61,7 +61,7 @@ from awx.main.utils import (get_ansible_version, get_ssh_version, decrypt_field,
 from awx.main.utils.safe_yaml import safe_dump, sanitize_jinja
 from awx.main.utils.reload import stop_local_services
 from awx.main.utils.pglock import advisory_lock
-from awx.main.utils.ha import update_celery_worker_routes, register_celery_worker_queues
+from awx.main.utils.ha import register_celery_worker_queues
 from awx.main.consumers import emit_channel_notification
 from awx.conf import settings_registry
 
@@ -201,39 +201,24 @@ def handle_ha_toplogy_changes(self):
     awx_app = Celery('awx')
     awx_app.config_from_object('django.conf:settings')
     instances, removed_queues, added_queues = register_celery_worker_queues(awx_app, self.request.hostname)
-    for instance in instances:
-        logger.info(six.text_type("Workers on tower node '{}' removed from queues {} and added to queues {}")
-                    .format(instance.hostname, removed_queues, added_queues))
-        updated_routes = update_celery_worker_routes(instance, settings)
-        logger.info(six.text_type("Worker on tower node '{}' updated celery routes {} all routes are now {}")
-                    .format(instance.hostname, updated_routes, self.app.conf.CELERY_ROUTES))
+    if len(removed_queues) + len(added_queues) > 0:
+        logger.info(six.text_type("Workers on tower node(s) '{}' removed from queues {} and added to queues {}")
+                    .format([i.hostname for i in instances], removed_queues, added_queues))
 
 
 @worker_ready.connect
 def handle_ha_toplogy_worker_ready(sender, **kwargs):
     logger.debug(six.text_type("Configure celeryd queues task on host {}").format(sender.hostname))
     instances, removed_queues, added_queues = register_celery_worker_queues(sender.app, sender.hostname)
-    for instance in instances:
-        logger.info(six.text_type("Workers on tower node '{}' unsubscribed from queues {} and subscribed to queues {}")
-                    .format(instance.hostname, removed_queues, added_queues))
+    if len(removed_queues) + len(added_queues) > 0:
+        logger.info(six.text_type("Workers on tower node(s) '{}' removed from queues {} and added to queues {}")
+                    .format([i.hostname for i in instances], removed_queues, added_queues))
 
     # Expedite the first hearbeat run so a node comes online quickly.
     cluster_node_heartbeat.apply([])
     apply_cluster_membership_policies.apply([])
 
 
-@celeryd_init.connect
-def handle_update_celery_routes(sender=None, conf=None, **kwargs):
-    conf = conf if conf else sender.app.conf
-    logger.debug(six.text_type("Registering celery routes for {}").format(sender))
-    (changed, instance) = Instance.objects.get_or_register()
-    if changed:
-        logger.info(six.text_type("Registered tower node '{}'").format(instance.hostname))
-    added_routes = update_celery_worker_routes(instance, conf)
-    logger.info(six.text_type("Workers on tower node '{}' added routes {} all routes are now {}")
-                .format(instance.hostname, added_routes, conf.CELERY_ROUTES))
-
-
 @celeryd_after_setup.connect
 def handle_update_celery_hostname(sender, instance, **kwargs):
     (changed, tower_instance) = Instance.objects.get_or_register()
diff --git a/awx/main/tests/unit/utils/test_ha.py b/awx/main/tests/unit/utils/test_ha.py
index 6432be7a32..94cb7d3606 100644
--- a/awx/main/tests/unit/utils/test_ha.py
+++ b/awx/main/tests/unit/utils/test_ha.py
@@ -11,18 +11,10 @@ from contextlib import nested
 # AWX
 from awx.main.utils.ha import (
     _add_remove_celery_worker_queues,
-    update_celery_worker_routes,
+    AWXCeleryRouter,
 )
 
 
-@pytest.fixture
-def conf():
-    class Conf():
-        CELERY_ROUTES = dict()
-        CELERYBEAT_SCHEDULE = dict()
-    return Conf()
-
-
 class TestAddRemoveCeleryWorkerQueues():
     @pytest.fixture
     def instance_generator(self, mocker):
@@ -73,7 +65,7 @@ class TestAddRemoveCeleryWorkerQueues():
             assert set(removed_queues) == set(removed_expected)
 
 
-class TestUpdateCeleryWorkerRoutes():
+class TestUpdateCeleryWorkerRouter():
 
     @pytest.mark.parametrize("is_controller,expected_routes", [
         (False, {
@@ -86,20 +78,16 @@ class TestUpdateCeleryWorkerRoutes():
             'awx.main.tasks.awx_isolated_heartbeat': {'queue': 'east-1', 'routing_key': 'east-1'},
         }),
     ])
-    def test_update_celery_worker_routes(self, mocker, conf, is_controller, expected_routes):
-        instance = mocker.MagicMock()
-        instance.hostname = 'east-1'
-        instance.is_controller = mocker.MagicMock(return_value=is_controller)
+    def test_update_celery_worker_routes(self, mocker, is_controller, expected_routes):
+        def get_or_register():
+            instance = mock.MagicMock()
+            instance.hostname = 'east-1'
+            instance.is_controller = mock.MagicMock(return_value=is_controller)
+            return (False, instance)
 
-        assert update_celery_worker_routes(instance, conf) == expected_routes
-        assert conf.CELERY_ROUTES == expected_routes
+        with mock.patch('awx.main.models.Instance.objects.get_or_register', get_or_register):
+            router = AWXCeleryRouter()
 
-    def test_update_celery_worker_routes_deleted(self, mocker, conf):
-        instance = mocker.MagicMock()
-        instance.hostname = 'east-1'
-        instance.is_controller = mocker.MagicMock(return_value=False)
-        conf.CELERY_ROUTES = {'awx.main.tasks.awx_isolated_heartbeat': 'foobar'}
-
-        update_celery_worker_routes(instance, conf)
-        assert 'awx.main.tasks.awx_isolated_heartbeat' not in conf.CELERY_ROUTES
+            for k,v in expected_routes.iteritems():
+                assert router.route_for_task(k) == v
 
diff --git a/awx/main/utils/ha.py b/awx/main/utils/ha.py
index 1e3bee15fd..91b9a0c05b 100644
--- a/awx/main/utils/ha.py
+++ b/awx/main/utils/ha.py
@@ -52,24 +52,21 @@ def _add_remove_celery_worker_queues(app, controlled_instances, worker_queues, w
     return (added_queues, removed_queues)
 
 
-def update_celery_worker_routes(instance, conf):
-    tasks = [
-        'awx.main.tasks.cluster_node_heartbeat',
-        'awx.main.tasks.purge_old_stdout_files',
-    ]
-    routes_updated = {}
-    # Instance is, effectively, a controller node
-    if instance.is_controller():
-        tasks.append('awx.main.tasks.awx_isolated_heartbeat')
-    else:
-        if 'awx.main.tasks.awx_isolated_heartbeat' in conf.CELERY_ROUTES:
-            del conf.CELERY_ROUTES['awx.main.tasks.awx_isolated_heartbeat']
+class AWXCeleryRouter(object):
+    def route_for_task(self, task, args=None, kwargs=None):
+        (changed, instance) = Instance.objects.get_or_register()
+        tasks = [
+            'awx.main.tasks.cluster_node_heartbeat',
+            'awx.main.tasks.purge_old_stdout_files',
+        ]
+        isolated_tasks = [
+            'awx.main.tasks.awx_isolated_heartbeat',
+        ]
+        if task in tasks:
+            return {'queue': instance.hostname.encode("utf8"), 'routing_key': instance.hostname.encode("utf8")}
 
-    for t in tasks:
-        conf.CELERY_ROUTES[t] = {'queue': instance.hostname.encode("utf8"), 'routing_key': instance.hostname.encode("utf8")}
-        routes_updated[t] = conf.CELERY_ROUTES[t]
-
-    return routes_updated
+        if instance.is_controller() and task in isolated_tasks:
+            return {'queue': instance.hostname.encode("utf8"), 'routing_key': instance.hostname.encode("utf8")}
 
 
 def register_celery_worker_queues(app, celery_worker_name):
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 4a7fc96358..b4db5c63e1 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -454,6 +454,9 @@ BROKER_POOL_LIMIT = None
 BROKER_URL = 'amqp://guest:guest@localhost:5672//'
 CELERY_EVENT_QUEUE_TTL = 5
 CELERY_DEFAULT_QUEUE = 'awx_private_queue'
+CELERY_DEFAULT_EXCHANGE = 'awx_private_queue'
+CELERY_DEFAULT_ROUTING_KEY = 'awx_private_queue'
+CELERY_DEFAULT_EXCHANGE_TYPE = 'direct'
 CELERY_TASK_SERIALIZER = 'json'
 CELERY_RESULT_SERIALIZER = 'json'
 CELERY_ACCEPT_CONTENT = ['json']
@@ -465,7 +468,7 @@ CELERYD_AUTOSCALER = 'awx.main.utils.autoscale:DynamicAutoScaler'
 CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend'
 CELERY_IMPORTS = ('awx.main.scheduler.tasks',)
 CELERY_QUEUES = ()
-CELERY_ROUTES = {}
+CELERY_ROUTES = ('awx.main.utils.ha.AWXCeleryRouter',)
 
 
 def log_celery_failure(*args):

From 902b1af417232e3ba6c750e981e2371a19888862 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Wed, 2 May 2018 13:24:57 -0400
Subject: [PATCH 044/169] fix access check for wfjt node copy

---
 awx/main/access.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/awx/main/access.py b/awx/main/access.py
index ef2577d695..ac257a64ba 100644
--- a/awx/main/access.py
+++ b/awx/main/access.py
@@ -1814,13 +1814,14 @@ class WorkflowJobTemplateAccess(BaseAccess):
             missing_credentials = []
             missing_inventories = []
             qs = obj.workflow_job_template_nodes
-            qs = qs.prefetch_related('unified_job_template', 'inventory__use_role', 'credential__use_role')
+            qs = qs.prefetch_related('unified_job_template', 'inventory__use_role', 'credentials__use_role')
             for node in qs.all():
                 node_errors = {}
                 if node.inventory and self.user not in node.inventory.use_role:
                     missing_inventories.append(node.inventory.name)
-                if node.credential and self.user not in node.credential.use_role:
-                    missing_credentials.append(node.credential.name)
+                for cred in node.credentials.all():
+                    if self.user not in cred.use_role:
+                        missing_credentials.append(node.credential.name)
                 ujt = node.unified_job_template
                 if ujt and not self.user.can_access(UnifiedJobTemplate, 'start', ujt, validate_license=False):
                     missing_ujt.append(ujt.name)

From 7a3fb02791613546af8c8dfdb26442907451b98e Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Wed, 2 May 2018 10:44:04 -0700
Subject: [PATCH 045/169] Aligns text for canceling/deleting a job on the jobs
 list & the stdout page

---
 awx/ui/client/features/jobs/jobsList.controller.js |  5 +++--
 awx/ui/client/features/output/details.directive.js | 13 +++++++------
 awx/ui/client/features/output/jobs.strings.js      |  8 --------
 awx/ui/client/index.template.ejs                   |  2 +-
 awx/ui/client/lib/services/base-string.service.js  |  5 ++++-
 awx/ui/client/src/shared/prompt-dialog.js          |  7 ++++---
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js
index dbb32a93c3..7b5b4d8656 100644
--- a/awx/ui/client/features/jobs/jobsList.controller.js
+++ b/awx/ui/client/features/jobs/jobsList.controller.js
@@ -132,7 +132,7 @@ function ListJobsController (
             resourceName: $filter('sanitize')(job.name),
             body: deleteModalBody,
             action,
-            actionText: 'DELETE'
+            actionText: strings.get('DELETE'),
         });
     };
 
@@ -174,7 +174,8 @@ function ListJobsController (
             resourceName: $filter('sanitize')(job.name),
             body: deleteModalBody,
             action,
-            actionText: strings.get('OK')
+            actionText: strings.get('cancelJob.CANCEL_JOB'),
+            cancelText: strings.get('cancelJob.RETURN')
         });
     };
 
diff --git a/awx/ui/client/features/output/details.directive.js b/awx/ui/client/features/output/details.directive.js
index d4e590e1c3..76d25270d5 100644
--- a/awx/ui/client/features/output/details.directive.js
+++ b/awx/ui/client/features/output/details.directive.js
@@ -442,9 +442,10 @@ function toggleLabels () {
 }
 
 function cancelJob () {
-    const actionText = strings.get('warnings.CANCEL_ACTION');
-    const hdr = strings.get('warnings.CANCEL_HEADER');
-    const warning = strings.get('warnings.CANCEL_BODY');
+    const actionText = strings.get('cancelJob.CANCEL_JOB');
+    const hdr = strings.get('cancelJob.HEADER');
+    const warning = strings.get('cancelJob.SUBMIT_REQUEST');
+    const cancelText = strings.get('cancelJob.RETURN');
 
     const id = resource.model.get('id');
     const name = $filter('sanitize')(resource.model.get('name'));
@@ -467,13 +468,13 @@ function cancelJob () {
             });
     };
 
-    prompt({ hdr, resourceName, body, actionText, action });
+    prompt({ hdr, resourceName, body, actionText, action, cancelText });
 }
 
 function deleteJob () {
     const actionText = strings.get('DELETE');
-    const hdr = strings.get('warnings.DELETE_HEADER');
-    const warning = strings.get('warnings.DELETE_BODY');
+    const hdr = strings.get('deleteResource.HEADER');
+    const warning = strings.get('deleteResource.CONFIRM', 'job');
 
     const id = resource.model.get('id');
     const name = $filter('sanitize')(resource.model.get('name'));
diff --git a/awx/ui/client/features/output/jobs.strings.js b/awx/ui/client/features/output/jobs.strings.js
index f1f3ace11d..742c4c38fb 100644
--- a/awx/ui/client/features/output/jobs.strings.js
+++ b/awx/ui/client/features/output/jobs.strings.js
@@ -8,14 +8,6 @@ function JobsStrings (BaseString) {
         TITLE: t.s('JOBZ')
     };
 
-    ns.warnings = {
-        CANCEL_ACTION: t.s('PROCEED'),
-        CANCEL_BODY: t.s('Are you sure you want to cancel this job?'),
-        CANCEL_HEADER: t.s('Cancel Job'),
-        DELETE_BODY: t.s('Are you sure you want to delete this job?'),
-        DELETE_HEADER: t.s('Delete Job'),
-    };
-
     ns.status = {
         RUNNING: t.s('The host status bar will update when the job is complete.'),
         UNAVAILABLE: t.s('Host status information for this job is unavailable.'),
diff --git a/awx/ui/client/index.template.ejs b/awx/ui/client/index.template.ejs
index 6f6a5c2cba..2fc0f09c30 100644
--- a/awx/ui/client/index.template.ejs
+++ b/awx/ui/client/index.template.ejs
@@ -48,7 +48,7 @@
                         <div class="Modal-body" ng-bind-html="promptBody" id="prompt-body">
                         </div>
                         <div class="Modal-footer">
-                            <a href="#" data-target="#prompt-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton" translate>CANCEL</a>
+                            <a href="#" data-target="#prompt-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton" ng-bind="cancelActionText"></a>
                             <a href="" ng-hide="hideActionButton" ng-class="promptActionBtnClass" ng-click="promptAction()" id="prompt_action_btn" class="btn Modal-footerButton" ng-bind="promptActionText"></a>
                         </div>
                     </div>
diff --git a/awx/ui/client/lib/services/base-string.service.js b/awx/ui/client/lib/services/base-string.service.js
index b024b8ad3e..cab067700e 100644
--- a/awx/ui/client/lib/services/base-string.service.js
+++ b/awx/ui/client/lib/services/base-string.service.js
@@ -69,6 +69,7 @@ function BaseStringService (namespace) {
     this.JSON = t.s('JSON');
     this.DELETE = t.s('DELETE');
     this.COPY = t.s('COPY');
+    this.YES = t.s('YES');
 
     this.deleteResource = {
         HEADER: t.s('Delete'),
@@ -79,7 +80,9 @@ function BaseStringService (namespace) {
 
     this.cancelJob = {
         HEADER: t.s('Cancel'),
-        SUBMIT_REQUEST: t.s('Are you sure you want to submit the request to cancel this job?')
+        SUBMIT_REQUEST: t.s('Are you sure you want to submit the request to cancel this job?'),
+        CANCEL_JOB: t.s('Cancel Job'),
+        RETURN: t.s('Return')
     };
 
     this.error = {
diff --git a/awx/ui/client/src/shared/prompt-dialog.js b/awx/ui/client/src/shared/prompt-dialog.js
index 2d5cc58ddf..cfcc9e0e2e 100644
--- a/awx/ui/client/src/shared/prompt-dialog.js
+++ b/awx/ui/client/src/shared/prompt-dialog.js
@@ -31,8 +31,8 @@
 
 export default
 angular.module('PromptDialog', ['Utilities'])
-    .factory('Prompt', [
-        function () {
+    .factory('Prompt', [ 'AppStrings',
+        function (strings) {
             return function (params) {
 
                 var dialog = angular.element(document.getElementById('prompt-modal')),
@@ -42,7 +42,8 @@ angular.module('PromptDialog', ['Utilities'])
                 scope.promptResourceName = params.resourceName;
                 scope.promptBody = params.body;
                 scope.promptAction = params.action;
-                scope.promptActionText = (params.actionText === null || params.actionText === undefined || params.actionText === '') ? 'YES' : params.actionText;
+                scope.promptActionText = (params.actionText === null || params.actionText === undefined || params.actionText === '') ? strings.get('YES') : params.actionText;
+                scope.cancelActionText = (params.cancelText === null || params.cancelText === undefined || params.cancelText === '') ? strings.get('CANCEL') : params.cancelText;
                 scope.hideActionButton = params.hideActionButton ? true : false;
 
                 local_backdrop = (params.backdrop === undefined) ? "static" : params.backdrop;

From 368a03706270978c88c1bec892f5af9a346fd4b8 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Wed, 2 May 2018 14:16:08 -0400
Subject: [PATCH 046/169] Remove non-filterable fields from search key and
 treat searches using those keys like string searches.

---
 .../shared/smart-search/queryset.service.js   | 12 ++++----
 .../smart-search/smart-search.controller.js   | 28 +++++++++++++++++--
 .../smart-search/smart-search.partial.html    |  2 +-
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/awx/ui/client/src/shared/smart-search/queryset.service.js b/awx/ui/client/src/shared/smart-search/queryset.service.js
index 7d79ac1ec1..7d34a40a4e 100644
--- a/awx/ui/client/src/shared/smart-search/queryset.service.js
+++ b/awx/ui/client/src/shared/smart-search/queryset.service.js
@@ -364,7 +364,7 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
 
             return merged;
         },
-        getSearchInputQueryset (searchInput, isRelatedField = null, isAnsibleFactField = null, singleSearchParam = null) {
+        getSearchInputQueryset (searchInput, isFilterableBaseField = null, isRelatedField = null, isAnsibleFactField = null, singleSearchParam = null) {
             // XXX Should find a better approach than passing in the two 'is...Field' callbacks XXX
             const space = '%20and%20';
             let params = {};
@@ -406,12 +406,12 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
 
                 if (termParts.length === 1) {
                     termParams = searchWithoutKey(term, singleSearchParam);
-                } else if (isAnsibleFactField && isAnsibleFactField(termParts)) {
+                } else if ((isAnsibleFactField && isAnsibleFactField(termParts)) || (isFilterableBaseField && isFilterableBaseField(termParts))) {
                     termParams = this.encodeParam({ term, singleSearchParam });
                 } else if (isRelatedField && isRelatedField(termParts)) {
                     termParams = this.encodeParam({ term, singleSearchParam, related: true });
                 } else {
-                    termParams = this.encodeParam({ term, singleSearchParam });
+                    termParams = searchWithoutKey(term, singleSearchParam);
                 }
 
                 params = _.merge(params, termParams, combineSameSearches);
@@ -419,7 +419,7 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
 
             return params;
         },
-        removeTermsFromQueryset(queryset, term, isRelatedField = null, singleSearchParam = null) {
+        removeTermsFromQueryset(queryset, term, isFilterableBaseField, isRelatedField = null, isAnsibleFactField = null, singleSearchParam = null) {
             const modifiedQueryset = _.cloneDeep(queryset);
 
             const removeSingleTermFromQueryset = (value, key) => {
@@ -457,10 +457,12 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
 
             if (termParts.length === 1) {
                 removed = searchWithoutKey(term, singleSearchParam);
+            } else if ((isAnsibleFactField && isAnsibleFactField(termParts)) || (isFilterableBaseField && isFilterableBaseField(termParts))) {
+                removed = this.encodeParam({ term, singleSearchParam });
             } else if (isRelatedField && isRelatedField(termParts)) {
                 removed = this.encodeParam({ term, singleSearchParam, related: true });
             } else {
-                removed = this.encodeParam({ term, singleSearchParam });
+                removed = searchWithoutKey(term, singleSearchParam);
             }
 
             if (!removed) {
diff --git a/awx/ui/client/src/shared/smart-search/smart-search.controller.js b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
index 560fbd0c0c..0bab35df39 100644
--- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
@@ -52,6 +52,12 @@ function SmartSearchController (
             .then((data) => {
                 $scope.models = data.models;
                 $scope.options = data.options.data;
+                $scope.keyFields = _.reduce(data.models[$scope.djangoModel].base, function(result, value, key) {
+                    if (!(typeof value.filterable === "boolean" && value.filterable === false)) {
+                        result.push(key);
+                    }
+                    return result;
+                }, []);
                 if ($scope.list) {
                     $scope.$emit(optionsKey, data.options);
                 }
@@ -139,6 +145,17 @@ function SmartSearchController (
         return rootField === 'ansible_facts';
     }
 
+    function isFilterableBaseField (termParts) {
+        const rootField = termParts[0].split('.')[0].replace(/^-/, '');
+        const listName = $scope.list.name;
+        const baseFieldPath = `models.${listName}.base.${rootField}`;
+        const isBaseField = _.has($scope, `${baseFieldPath}`);
+        const filterable = _.get($scope, `${baseFieldPath}.filterable`);
+        const isNotFilterable = typeof filterable === "boolean" && filterable === false;
+        const isBaseModelRelatedSearchTermField = (_.get($scope, `${baseFieldPath}.type`) === 'field');
+        return isBaseField && !isBaseModelRelatedSearchTermField && !isNotFilterable;
+    }
+
     function isRelatedField (termParts) {
         const rootField = termParts[0].split('.')[0].replace(/^-/, '');
         const listName = $scope.list.name;
@@ -154,7 +171,7 @@ function SmartSearchController (
         const { singleSearchParam } = $scope;
         const unmodifiedQueryset = _.clone(queryset);
 
-        const searchInputQueryset = qs.getSearchInputQueryset(terms, isRelatedField, isAnsibleFactField, singleSearchParam);
+        const searchInputQueryset = qs.getSearchInputQueryset(terms, isFilterableBaseField, isRelatedField, isAnsibleFactField, singleSearchParam);
         queryset = qs.mergeQueryset(queryset, searchInputQueryset, singleSearchParam);
 
         // Go back to the first page after a new search
@@ -191,7 +208,7 @@ function SmartSearchController (
         const { singleSearchParam } = $scope;
         const [term] = $scope.searchTags.splice(index, 1);
 
-        queryset = qs.removeTermsFromQueryset(queryset, term, isRelatedField, singleSearchParam);
+        queryset = qs.removeTermsFromQueryset(queryset, term, isFilterableBaseField, isRelatedField, isAnsibleFactField, singleSearchParam);
 
         if (!$scope.querySet) {
             $state.go('.', { [searchKey]: queryset })
@@ -199,7 +216,7 @@ function SmartSearchController (
                     // for some reason deleting a tag from a list in a modal does not
                     // remove the param from $stateParams.  Here we'll manually check to make sure
                     // that that happened and remove it if it didn't.
-                    const clearedParams = qs.removeTermsFromQueryset($stateParams[searchKey], term, isRelatedField, singleSearchParam);
+                    const clearedParams = qs.removeTermsFromQueryset($stateParams[searchKey], term, isFilterableBaseField, isRelatedField, isAnsibleFactField, singleSearchParam);
                     $stateParams[searchKey] = clearedParams;
                 });
         }
@@ -238,6 +255,11 @@ function SmartSearchController (
 
         $scope.searchTags = qs.stripDefaultParams(queryset, defaults);
     };
+
+    $scope.hideUnfilterable = (field) => {
+        console.log(field);
+        return !(typeof field.value.filterable === "boolean" && field.value.filterable === false);
+    };
 }
 
 SmartSearchController.$inject = [
diff --git a/awx/ui/client/src/shared/smart-search/smart-search.partial.html b/awx/ui/client/src/shared/smart-search/smart-search.partial.html
index ce52fea759..a44a90f649 100644
--- a/awx/ui/client/src/shared/smart-search/smart-search.partial.html
+++ b/awx/ui/client/src/shared/smart-search/smart-search.partial.html
@@ -42,7 +42,7 @@
             </div>
         </div>
         <div class="SmartSearch-keyRow">
-            <b translate>FIELDS:</b> <span ng-repeat="(key,value) in model.base">{{ key }}<span ng-if="!$last">, </span></span>
+            <b translate>FIELDS:</b> <span ng-repeat="field in keyFields">{{ field }}<span ng-if="!$last">, </span></span>
         </div>
         <div class="SmartSearch-keyRow" ng-show="model.related && model.related.length > 0">
             <b translate>RELATED FIELDS:</b> <span ng-repeat="relation in model.related">{{ relation }}<span ng-if="!$last">, </span></span>

From 45ffe7a955c5fc854104837a9fb80c05b0827443 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Wed, 2 May 2018 13:50:59 -0400
Subject: [PATCH 047/169] update api-ui job urls

---
 awx/main/models/ad_hoc_commands.py | 2 +-
 awx/main/models/inventory.py       | 2 +-
 awx/main/models/jobs.py            | 4 ++--
 awx/main/models/projects.py        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/awx/main/models/ad_hoc_commands.py b/awx/main/models/ad_hoc_commands.py
index 3913a4ace7..3549bb2a41 100644
--- a/awx/main/models/ad_hoc_commands.py
+++ b/awx/main/models/ad_hoc_commands.py
@@ -153,7 +153,7 @@ class AdHocCommand(UnifiedJob, JobNotificationMixin):
         return reverse('api:ad_hoc_command_detail', kwargs={'pk': self.pk}, request=request)
 
     def get_ui_url(self):
-        return urljoin(settings.TOWER_URL_BASE, "/#/ad_hoc_commands/{}".format(self.pk))
+        return urljoin(settings.TOWER_URL_BASE, "/#/jobs/command/{}".format(self.pk))
 
     @property
     def notification_templates(self):
diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py
index c748f841f3..24d0e9a1c5 100644
--- a/awx/main/models/inventory.py
+++ b/awx/main/models/inventory.py
@@ -1646,7 +1646,7 @@ class InventoryUpdate(UnifiedJob, InventorySourceOptions, JobNotificationMixin,
         return reverse('api:inventory_update_detail', kwargs={'pk': self.pk}, request=request)
 
     def get_ui_url(self):
-        return urljoin(settings.TOWER_URL_BASE, "/#/inventory_sync/{}".format(self.pk))
+        return urljoin(settings.TOWER_URL_BASE, "/#/jobs/inventory/{}".format(self.pk))
 
     def get_actual_source_path(self):
         '''Alias to source_path that combines with project path for for SCM file based sources'''
diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index 51394aa830..80280636cc 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -530,7 +530,7 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
         return reverse('api:job_detail', kwargs={'pk': self.pk}, request=request)
 
     def get_ui_url(self):
-        return urljoin(settings.TOWER_URL_BASE, "/#/jobs/{}".format(self.pk))
+        return urljoin(settings.TOWER_URL_BASE, "/#/jobs/playbook/{}".format(self.pk))
 
     @property
     def ansible_virtualenv_path(self):
@@ -1192,7 +1192,7 @@ class SystemJob(UnifiedJob, SystemJobOptions, JobNotificationMixin):
         return reverse('api:system_job_detail', kwargs={'pk': self.pk}, request=request)
 
     def get_ui_url(self):
-        return urljoin(settings.TOWER_URL_BASE, "/#/management_jobs/{}".format(self.pk))
+        return urljoin(settings.TOWER_URL_BASE, "/#/jobs/system/{}".format(self.pk))
 
     @property
     def event_class(self):
diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py
index d302aa0973..d99fe5bafb 100644
--- a/awx/main/models/projects.py
+++ b/awx/main/models/projects.py
@@ -533,7 +533,7 @@ class ProjectUpdate(UnifiedJob, ProjectOptions, JobNotificationMixin, TaskManage
         return reverse('api:project_update_detail', kwargs={'pk': self.pk}, request=request)
 
     def get_ui_url(self):
-        return urlparse.urljoin(settings.TOWER_URL_BASE, "/#/scm_update/{}".format(self.pk))
+        return urlparse.urljoin(settings.TOWER_URL_BASE, "/#/jobs/project/{}".format(self.pk))
 
     def _update_parent_instance(self):
         parent_instance = self._get_parent_instance()

From 84c0fdfa4a22a9b7741522c9d9dc53b0bf249518 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Wed, 2 May 2018 14:21:43 -0400
Subject: [PATCH 048/169] Removed unused function

---
 .../src/shared/smart-search/smart-search.controller.js       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/awx/ui/client/src/shared/smart-search/smart-search.controller.js b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
index 0bab35df39..fb0a4c0701 100644
--- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
@@ -255,11 +255,6 @@ function SmartSearchController (
 
         $scope.searchTags = qs.stripDefaultParams(queryset, defaults);
     };
-
-    $scope.hideUnfilterable = (field) => {
-        console.log(field);
-        return !(typeof field.value.filterable === "boolean" && field.value.filterable === false);
-    };
 }
 
 SmartSearchController.$inject = [

From 59744e421f60264a8d6aedb008082c1945178f85 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Wed, 2 May 2018 15:18:20 -0400
Subject: [PATCH 049/169] send our oddball loggers to external logger too

---
 awx/settings/defaults.py                              | 7 ++-----
 awx/settings/local_settings.py.docker_compose         | 7 +++----
 installer/roles/image_build/files/settings.py         | 7 +++----
 installer/roles/kubernetes/templates/configmap.yml.j2 | 7 +++----
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index b4db5c63e1..2150aa77d8 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -1161,16 +1161,13 @@ LOGGING = {
             'propagate': False
         },
         'awx.main.tasks': {
-            'handlers': ['task_system'],
+            'handlers': ['task_system', 'external_logger'],
             'propagate': False
         },
         'awx.main.scheduler': {
-            'handlers': ['task_system'],
+            'handlers': ['task_system', 'external_logger'],
             'propagate': False
         },
-        'awx.main.consumers': {
-            'handlers': ['null']
-        },
         'awx.main.access': {
             'handlers': ['null'],
             'propagate': False,
diff --git a/awx/settings/local_settings.py.docker_compose b/awx/settings/local_settings.py.docker_compose
index 7381345b25..8da2628e38 100644
--- a/awx/settings/local_settings.py.docker_compose
+++ b/awx/settings/local_settings.py.docker_compose
@@ -195,11 +195,10 @@ LOGGING['handlers']['syslog'] = {
 
 LOGGING['loggers']['django.request']['handlers'] = ['console']
 LOGGING['loggers']['rest_framework.request']['handlers'] = ['console']
-LOGGING['loggers']['awx']['handlers'] = ['console']
+LOGGING['loggers']['awx']['handlers'] = ['console', 'external_logger']
 LOGGING['loggers']['awx.main.commands.run_callback_receiver']['handlers'] = ['console']
-LOGGING['loggers']['awx.main.commands.inventory_import']['handlers'] = ['console']
-LOGGING['loggers']['awx.main.tasks']['handlers'] = ['console']
-LOGGING['loggers']['awx.main.scheduler']['handlers'] = ['console']
+LOGGING['loggers']['awx.main.tasks']['handlers'] = ['console', 'external_logger']
+LOGGING['loggers']['awx.main.scheduler']['handlers'] = ['console', 'external_logger']
 LOGGING['loggers']['django_auth_ldap']['handlers'] = ['console']
 LOGGING['loggers']['social']['handlers'] = ['console']
 LOGGING['loggers']['system_tracking_migrations']['handlers'] = ['console']
diff --git a/installer/roles/image_build/files/settings.py b/installer/roles/image_build/files/settings.py
index 0610df48dd..4062d9a69a 100644
--- a/installer/roles/image_build/files/settings.py
+++ b/installer/roles/image_build/files/settings.py
@@ -55,11 +55,10 @@ LOGGING['handlers']['console'] = {
 
 LOGGING['loggers']['django.request']['handlers'] = ['console']
 LOGGING['loggers']['rest_framework.request']['handlers'] = ['console']
-LOGGING['loggers']['awx']['handlers'] = ['console']
+LOGGING['loggers']['awx']['handlers'] = ['console', 'external_logger']
 LOGGING['loggers']['awx.main.commands.run_callback_receiver']['handlers'] = ['console']
-LOGGING['loggers']['awx.main.commands.inventory_import']['handlers'] = ['console']
-LOGGING['loggers']['awx.main.tasks']['handlers'] = ['console']
-LOGGING['loggers']['awx.main.scheduler']['handlers'] = ['console']
+LOGGING['loggers']['awx.main.tasks']['handlers'] = ['console', 'external_logger']
+LOGGING['loggers']['awx.main.scheduler']['handlers'] = ['console', 'external_logger']
 LOGGING['loggers']['django_auth_ldap']['handlers'] = ['console']
 LOGGING['loggers']['social']['handlers'] = ['console']
 LOGGING['loggers']['system_tracking_migrations']['handlers'] = ['console']
diff --git a/installer/roles/kubernetes/templates/configmap.yml.j2 b/installer/roles/kubernetes/templates/configmap.yml.j2
index 47eff32c89..26c44e50da 100644
--- a/installer/roles/kubernetes/templates/configmap.yml.j2
+++ b/installer/roles/kubernetes/templates/configmap.yml.j2
@@ -51,11 +51,10 @@ data:
     
     LOGGING['loggers']['django.request']['handlers'] = ['console']
     LOGGING['loggers']['rest_framework.request']['handlers'] = ['console']
-    LOGGING['loggers']['awx']['handlers'] = ['console']
+    LOGGING['loggers']['awx']['handlers'] = ['console', 'external_logger']
     LOGGING['loggers']['awx.main.commands.run_callback_receiver']['handlers'] = ['console']
-    LOGGING['loggers']['awx.main.commands.inventory_import']['handlers'] = ['console']
-    LOGGING['loggers']['awx.main.tasks']['handlers'] = ['console']
-    LOGGING['loggers']['awx.main.scheduler']['handlers'] = ['console']
+    LOGGING['loggers']['awx.main.tasks']['handlers'] = ['console', 'external_logger']
+    LOGGING['loggers']['awx.main.scheduler']['handlers'] = ['console', 'external_logger']
     LOGGING['loggers']['django_auth_ldap']['handlers'] = ['console']
     LOGGING['loggers']['social']['handlers'] = ['console']
     LOGGING['loggers']['system_tracking_migrations']['handlers'] = ['console']

From 2140daf11e79c9ee4ec26fbd53c933d26bb26200 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Wed, 2 May 2018 15:55:23 -0400
Subject: [PATCH 050/169] Fix add button display property and add tooltips

* Add tooltips to list add buttons of instance groups, instances, and applications.
---
 awx/ui/client/features/applications/applications.strings.js | 4 ++++
 .../features/applications/list-applications.controller.js   | 4 ++++
 .../features/applications/list-applications.view.html       | 2 ++
 awx/ui/client/lib/theme/_global.less                        | 2 +-
 .../client/src/instance-groups/instance-groups.strings.js   | 5 +++++
 .../instance-groups/instances/instances-list.partial.html   | 2 ++
 .../src/instance-groups/instances/instances.controller.js   | 4 ++++
 .../instance-groups/list/instance-groups-list.controller.js | 4 ++++
 .../instance-groups/list/instance-groups-list.partial.html  | 2 ++
 awx/ui/test/e2e/objects/inventories.js                      | 6 +++---
 10 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/features/applications/applications.strings.js b/awx/ui/client/features/applications/applications.strings.js
index 0194efbf42..8dfcf521a2 100644
--- a/awx/ui/client/features/applications/applications.strings.js
+++ b/awx/ui/client/features/applications/applications.strings.js
@@ -16,6 +16,10 @@ function ApplicationsStrings (BaseString) {
         USERS: t.s('Tokens')
     };
 
+    ns.tooltips = {
+        ADD: t.s('Create a new Application')
+    };
+
     ns.add = {
         PANEL_TITLE: t.s('NEW APPLICATION')
     };
diff --git a/awx/ui/client/features/applications/list-applications.controller.js b/awx/ui/client/features/applications/list-applications.controller.js
index fd67589a08..8a6ad5a8bf 100644
--- a/awx/ui/client/features/applications/list-applications.controller.js
+++ b/awx/ui/client/features/applications/list-applications.controller.js
@@ -38,6 +38,10 @@ function ListApplicationsController (
         vm.applicationsCount = dataset.count;
     });
 
+    vm.tooltips = {
+        add: strings.get('tooltips.ADD')
+    };
+
     vm.getModified = app => {
         const modified = _.get(app, 'modified');
 
diff --git a/awx/ui/client/features/applications/list-applications.view.html b/awx/ui/client/features/applications/list-applications.view.html
index 1dd96b2dc1..c1ab24bd75 100644
--- a/awx/ui/client/features/applications/list-applications.view.html
+++ b/awx/ui/client/features/applications/list-applications.view.html
@@ -24,6 +24,8 @@
                     ui-sref="applications.add"
                     class="at-Button--add"
                     id="button-add"
+                    aw-tool-tip="{{vm.tooltips.add}}"
+                    data-placement="top"
                     aria-haspopup="true"
                     aria-expanded="false">
                 </button>
diff --git a/awx/ui/client/lib/theme/_global.less b/awx/ui/client/lib/theme/_global.less
index a06e58dfb3..01690ab2dd 100644
--- a/awx/ui/client/lib/theme/_global.less
+++ b/awx/ui/client/lib/theme/_global.less
@@ -24,7 +24,7 @@
         font-size: 20px;
     }
     border: none;
-    display: flex;
+    display: inline-flex;
     margin-left: @at-space-4x;
 
     &[aria-expanded="true"] {
diff --git a/awx/ui/client/src/instance-groups/instance-groups.strings.js b/awx/ui/client/src/instance-groups/instance-groups.strings.js
index ee4c992b75..e21ff78396 100644
--- a/awx/ui/client/src/instance-groups/instance-groups.strings.js
+++ b/awx/ui/client/src/instance-groups/instance-groups.strings.js
@@ -19,6 +19,11 @@ function InstanceGroupsStrings (BaseString) {
         JOBS: t.s('JOBS')
     };
 
+    ns.tooltips = {
+        ADD_INSTANCE_GROUP: t.s('Create a new Instance Group'),
+        ASSOCIATE_INSTANCES: t.s('Associate an existing Instance')
+    };
+
     ns.instance = {
         PANEL_TITLE: t.s('SELECT INSTANCE')
     };
diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
index 512b74f867..01868ef35d 100644
--- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
@@ -29,6 +29,8 @@
                     class="at-Button--add"
                     id="button-add"
                     ng-show="vm.isSuperuser"
+                    aw-tool-tip="{{vm.tooltips.add}}"
+                    data-placement="top"
                     aria-expanded="false">
                 </button>
                 <div ui-view="modal"></div>
diff --git a/awx/ui/client/src/instance-groups/instances/instances.controller.js b/awx/ui/client/src/instance-groups/instances/instances.controller.js
index 87281efae1..e81f9c106e 100644
--- a/awx/ui/client/src/instance-groups/instances/instances.controller.js
+++ b/awx/ui/client/src/instance-groups/instances/instances.controller.js
@@ -48,6 +48,10 @@ function InstancesController ($scope, $state, $http, models, Instance, strings,
         }
     };
 
+    vm.tooltips = {
+        add: strings.get('tooltips.ASSOCIATE_INSTANCES')
+    };
+
     vm.rowAction = {
         toggle: {
             _disabled: !vm.isSuperuser
diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js b/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js
index b3eccaffab..8568919616 100644
--- a/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js
+++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.controller.js
@@ -33,6 +33,10 @@ export default ['$scope', '$filter', '$state', 'Alert', 'resolvedModels', 'Datas
             vm.activeId = parseInt($state.params.instance_group_id);
         });
 
+        vm.tooltips = {
+            add: strings.get('tooltips.ADD_INSTANCE_GROUP')
+        };
+
         vm.rowAction = {
             trash: instance_group => {
                 return vm.isSuperuser && instance_group.name !== 'tower';
diff --git a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
index 2fa0440c1e..5aa48b1f29 100644
--- a/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
+++ b/awx/ui/client/src/instance-groups/list/instance-groups-list.partial.html
@@ -25,6 +25,8 @@
                     class="at-Button--add"
                     id="button-add"
                     ng-show="vm.isSuperuser"
+                    aw-tool-tip="{{vm.tooltips.add}}"
+                    data-placement="top"
                     aria-haspopup="true"
                     aria-expanded="false">
                 </button>
diff --git a/awx/ui/test/e2e/objects/inventories.js b/awx/ui/test/e2e/objects/inventories.js
index 0fc95f4360..dd60b80164 100644
--- a/awx/ui/test/e2e/objects/inventories.js
+++ b/awx/ui/test/e2e/objects/inventories.js
@@ -121,9 +121,9 @@ module.exports = {
             return this.navigate();
         },
         selectAdd (name) {
-            this.api.waitForElementVisible('button[id="button-add"]');
-            this.expect.element('button[id="button-add"]').enabled;
-            this.api.click('button[id="button-add"]');
+            this.api.waitForElementVisible('#button-add');
+            this.expect.element('#button-add').enabled;
+            this.api.click('#button-add');
 
             this.api.useXpath();
             this.api.waitForElementVisible(`.//a[normalize-space(text())="${name}"]`);

From 8b6ee8d360021fd9fdda4ea753fa7720cb2396ee Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Fri, 27 Apr 2018 14:35:32 -0400
Subject: [PATCH 051/169] Fix all of the issues for the 3.3 UX Hit List

* Portal mode job header
* Move edit buttons to beginning of action buttons
* Dashboard job row spacing
* Decrease toggle button height
* Remove extra scrollbars from job results standard out
---
 awx/ui/client/features/output/_index.less     |   3 +-
 awx/ui/client/lib/components/list/_index.less |   1 +
 awx/ui/client/lib/theme/_variables.less       |   4 +-
 .../dashboard/lists/dashboard-list.block.less |   2 +-
 .../job-templates-list.partial.html           |   6 +-
 .../inventories/inventory.list.js             |  14 +-
 .../related/hosts/related-host.list.js        |  14 +-
 .../related/sources/sources.list.js           |  14 +-
 .../notificationTemplates.list.js             |  19 +--
 .../portal-mode-layout.partial.html           |   5 +
 .../src/portal-mode/portal-mode.block.less    |   3 +-
 awx/ui/client/src/projects/projects.list.js   |  23 ++--
 .../src/scheduler/scheduleToggle.block.less   |  17 ++-
 awx/ui/client/src/templates/templates.list.js |  18 +--
 .../workflow-results/standard-out.block.less  | 126 ------------------
 15 files changed, 75 insertions(+), 194 deletions(-)

diff --git a/awx/ui/client/features/output/_index.less b/awx/ui/client/features/output/_index.less
index 0bb8a72aba..b6226d4491 100644
--- a/awx/ui/client/features/output/_index.less
+++ b/awx/ui/client/features/output/_index.less
@@ -135,6 +135,7 @@
         border-radius: 0;
         border-bottom-right-radius: 4px;
         border-bottom-left-radius: 4px;
+        max-height: ~"calc(100vh - 350px)";
 
         & > table {
             table-layout: fixed;
@@ -300,7 +301,7 @@
     display: grid;
     grid-gap: 20px;
     grid-template-columns: minmax(300px, 1fr) minmax(500px, 2fr);
-    grid-template-rows: minmax(500px, ~"calc(100vh - 140px)");
+    grid-template-rows: minmax(500px, ~"calc(100vh - 130px)");
 
     .at-Panel {
         overflow-y: scroll;
diff --git a/awx/ui/client/lib/components/list/_index.less b/awx/ui/client/lib/components/list/_index.less
index dfcb74adad..596dd1b6b7 100644
--- a/awx/ui/client/lib/components/list/_index.less
+++ b/awx/ui/client/lib/components/list/_index.less
@@ -120,6 +120,7 @@
 }
 
 .at-Row-toggle {
+    align-self: flex-start;
     margin-right: @at-space-4x;
 }
 
diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less
index 627d775c8e..89261e5dc9 100644
--- a/awx/ui/client/lib/theme/_variables.less
+++ b/awx/ui/client/lib/theme/_variables.less
@@ -246,7 +246,7 @@
 @at-padding-list-empty: @at-space-2x;
 @at-padding-list-row-item-tag: 0 @at-space-2x;
 @at-padding-list-row-action: 7px;
-@at-padding-list-row: 10px 20px;
+@at-padding-list-row: 10px 20px 10px 10px;
 
 @at-margin-input-message: @at-space;
 @at-margin-item-column: @at-space-3x;
@@ -264,7 +264,7 @@
 
 @at-margin-top-search-key: @at-space-2x;
 
-@at-margin-top-list: @at-space-5x;
+@at-margin-top-list: @at-space-4x;
 @at-margin-bottom-list-toolbar: @at-space-4x;
 @at-margin-left-toolbar-action: @at-space-4x;
 @at-margin-left-toolbar-carat: @at-space;
diff --git a/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less b/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less
index 55b14f5f3f..3440a881d3 100644
--- a/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less
+++ b/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less
@@ -61,7 +61,7 @@
 
 .DashboardList-tableHeader--actions {
     border-top-right-radius: 5px;
-    width: 90px;
+    width: 110px;
     padding-right: 15px;
     text-align: right;
 }
diff --git a/awx/ui/client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html b/awx/ui/client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html
index e60a7e5c71..bae76bedd8 100644
--- a/awx/ui/client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html
+++ b/awx/ui/client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html
@@ -32,12 +32,12 @@
               </td>
               <td class="List-actionsContainer">
                   <div class="List-actionButtonCell">
-                      <at-launch-template template="template"
-                          ng-show="template.can_start">
-                      </at-launch-template>
                       <button class="List-actionButton" ng-click="editTemplate(template)">
                           <i class="fa fa-pencil"></i>
                       </button>
+                      <at-launch-template template="template"
+                          ng-show="template.can_start">
+                      </at-launch-template>
                   </div>
                </td>
            </tr>
diff --git a/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js b/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js
index 07991c8397..f39f607d4a 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/inventory.list.js
@@ -93,13 +93,6 @@ export default ['i18n', function(i18n) {
 
         fieldActions: {
             columnClass: 'col-md-2 col-sm-3 col-xs-4',
-            network: {
-                label: i18n._('Network Visualization'),
-                ngClick: 'goToGraph(inventory)',
-                awToolTip: i18n._('Network Visualization'),
-                dataPlacement: 'top',
-                ngShow: '!inventory.pending_deletion'
-            },
             edit: {
                 label: i18n._('Edit'),
                 ngClick: 'editInventory(inventory)',
@@ -107,6 +100,13 @@ export default ['i18n', function(i18n) {
                 dataPlacement: 'top',
                 ngShow: '!inventory.pending_deletion && inventory.summary_fields.user_capabilities.edit'
             },
+            network: {
+                label: i18n._('Network Visualization'),
+                ngClick: 'goToGraph(inventory)',
+                awToolTip: i18n._('Network Visualization'),
+                dataPlacement: 'top',
+                ngShow: '!inventory.pending_deletion'
+            },
             copy: {
                 label: i18n._('Copy'),
                 ngClick: 'copyInventory(inventory)',
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js
index 24262c1017..35378abfd2 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.list.js
@@ -73,6 +73,13 @@ export default ['i18n', function(i18n) {
         fieldActions: {
 
             columnClass: 'col-lg-6 col-md-4 col-sm-4 col-xs-5 text-right',
+            edit: {
+                ngClick: "editHost(host)",
+                icon: 'icon-edit',
+                awToolTip: i18n._('Edit host'),
+                dataPlacement: 'top',
+                ngShow: 'host.summary_fields.user_capabilities.edit'
+            },
             insights: {
                 ngClick: "goToInsights(host)",
                 icon: 'fa-info',
@@ -81,13 +88,6 @@ export default ['i18n', function(i18n) {
                 ngShow: 'host.insights_system_id && host.summary_fields.inventory.hasOwnProperty("insights_credential_id")',
                 ngClass: "{'List-actionButton--selected': $stateParams['host_id'] == host.id && $state.is('inventories.edit.hosts.edit.insights')}"
             },
-            edit: {
-                ngClick: "editHost(host)",
-                icon: 'icon-edit',
-                awToolTip: i18n._('Edit host'),
-                dataPlacement: 'top',
-                ngShow: 'host.summary_fields.user_capabilities.edit'
-            },
             view: {
                 ngClick: "editHost(host)",
                 awToolTip: i18n._('View host'),
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js
index d2daa6b571..213eb28eb4 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.list.js
@@ -77,6 +77,13 @@
 
             columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-4 text-right',
 
+            edit: {
+                mode: 'all',
+                ngClick: "editSource(inventory_source.id)",
+                awToolTip: i18n._('Edit source'),
+                dataPlacement: "top",
+                ngShow: "inventory_source.summary_fields.user_capabilities.edit"
+            },
             source_update: {
                 mode: 'all',
                 ngClick: 'updateSource(inventory_source)',
@@ -105,13 +112,6 @@
                 dataPlacement: 'top',
                 ngShow: "!(inventory_source.summary_fields.inventory_source.source === '') && inventory_source.summary_fields.user_capabilities.schedule"
             },
-            edit: {
-                mode: 'all',
-                ngClick: "editSource(inventory_source.id)",
-                awToolTip: i18n._('Edit source'),
-                dataPlacement: "top",
-                ngShow: "inventory_source.summary_fields.user_capabilities.edit"
-            },
             view: {
                 mode: 'all',
                 ngClick: "editSource(inventory_source.id)",
diff --git a/awx/ui/client/src/notifications/notificationTemplates.list.js b/awx/ui/client/src/notifications/notificationTemplates.list.js
index 0e7182be9a..bb08a6d3d4 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.list.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.list.js
@@ -59,15 +59,7 @@ export default ['i18n', function(i18n){
         fieldActions: {
 
             columnClass: 'col-md-2 col-sm-3 col-xs-3',
-            test: {
-                ngClick: "testNotification(notification_template.id)",
-                icon: 'fa-bell-o',
-                label: i18n._('Edit'),
-                "class": 'btn-sm',
-                awToolTip: i18n._('Test notification'),
-                dataPlacement: 'top',
-                ngShow: 'notification_template.summary_fields.user_capabilities.edit'
-            },
+
             edit: {
                 ngClick: "editNotification(notification_template.id)",
                 icon: 'fa-edit',
@@ -77,6 +69,15 @@ export default ['i18n', function(i18n){
                 dataPlacement: 'top',
                 ngShow: 'notification_template.summary_fields.user_capabilities.edit'
             },
+            test: {
+                ngClick: "testNotification(notification_template.id)",
+                icon: 'fa-bell-o',
+                label: i18n._('Edit'),
+                "class": 'btn-sm',
+                awToolTip: i18n._('Test notification'),
+                dataPlacement: 'top',
+                ngShow: 'notification_template.summary_fields.user_capabilities.edit'
+            },
             copy: {
                 label: i18n._('Copy'),
                 ngClick: 'copyNotification(notification_template)',
diff --git a/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html b/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html
index 0a896e46a1..d9eade91b0 100644
--- a/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html
+++ b/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html
@@ -5,6 +5,11 @@
             </div>
             <div class="PortalMode-panel--right">
                 <div id="portal-container-jobs" class="Panel">
+                    <div class="List-header">
+                        <div class="List-title">
+                            <div class="List-titleText" translate>JOBS</div>
+                        </div>
+                    </div>
                     <div class="PortalMode-filterHolder">
                         <div class="FormToggle-container">
                             <div class="btn-group">
diff --git a/awx/ui/client/src/portal-mode/portal-mode.block.less b/awx/ui/client/src/portal-mode/portal-mode.block.less
index 747ceab325..a75aa028ae 100644
--- a/awx/ui/client/src/portal-mode/portal-mode.block.less
+++ b/awx/ui/client/src/portal-mode/portal-mode.block.less
@@ -17,7 +17,8 @@
 	}
 
     .List-header {
-        height: 20px;
+		height: 14px;
+		margin-bottom: 20px;
     }
 }
 .PortalMode-panelHeader{
diff --git a/awx/ui/client/src/projects/projects.list.js b/awx/ui/client/src/projects/projects.list.js
index f4d504304c..a43db7d900 100644
--- a/awx/ui/client/src/projects/projects.list.js
+++ b/awx/ui/client/src/projects/projects.list.js
@@ -35,7 +35,7 @@ export default ['i18n', function(i18n) {
             name: {
                 key: true,
                 label: i18n._('Name'),
-                columnClass: "col-lg-4 col-md-4 col-sm-5 col-xs-7 List-staticColumnAdjacent",
+                columnClass: "col-lg-4 col-md-4 col-sm-4 col-xs-7 List-staticColumnAdjacent",
                 modalColumnClass: 'col-md-8',
                 awToolTip: '{{project.description | sanitize}}',
                 dataPlacement: 'top'
@@ -44,18 +44,18 @@ export default ['i18n', function(i18n) {
                 label: i18n._('Type'),
                 ngBind: 'project.type_label',
                 excludeModal: true,
-                columnClass: 'col-lg-2 col-md-2 col-sm-3 hidden-xs'
+                columnClass: 'col-lg-2 col-md-2 col-sm-2 hidden-xs'
             },
             scm_revision: {
                 label: i18n._('Revision'),
                 excludeModal: true,
-                columnClass: 'List-tableCell col-lg-4 col-md-2 col-sm-3 hidden-xs',
+                columnClass: 'List-tableCell col-lg-2 col-md-2 hidden-sm hidden-xs',
                 type: 'revision'
             },
             last_updated: {
                 label: i18n._('Last Updated'),
                 filter: "longDate",
-                columnClass: "col-lg-3 col-md-3 hidden-sm hidden-xs",
+                columnClass: "col-lg-3 hidden-md hidden-sm hidden-xs",
                 excludeModal: true,
                 nosort: true
             }
@@ -82,8 +82,13 @@ export default ['i18n', function(i18n) {
 
         fieldActions: {
 
-            columnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-5',
-
+            columnClass: 'col-lg-4 col-md-3 col-sm-4 col-xs-5',
+            edit: {
+                ngClick: "editProject(project.id)",
+                awToolTip: i18n._('Edit the project'),
+                dataPlacement: 'top',
+                ngShow: "project.summary_fields.user_capabilities.edit"
+            },
             scm_update: {
                 ngClick: 'SCMUpdate(project.id, $event)',
                 awToolTip: "{{ project.scm_update_tooltip }}",
@@ -108,12 +113,6 @@ export default ['i18n', function(i18n) {
                 dataPlacement: 'top',
                 ngShow: 'project.summary_fields.user_capabilities.copy'
             },
-            edit: {
-                ngClick: "editProject(project.id)",
-                awToolTip: i18n._('Edit the project'),
-                dataPlacement: 'top',
-                ngShow: "project.summary_fields.user_capabilities.edit"
-            },
             view: {
                 ngClick: "editProject(project.id)",
                 awToolTip: i18n._('View the project'),
diff --git a/awx/ui/client/src/scheduler/scheduleToggle.block.less b/awx/ui/client/src/scheduler/scheduleToggle.block.less
index b234a0b5f2..8a90281050 100644
--- a/awx/ui/client/src/scheduler/scheduleToggle.block.less
+++ b/awx/ui/client/src/scheduler/scheduleToggle.block.less
@@ -15,8 +15,9 @@
     background-color: @default-link;
     margin-top: 2px;
     cursor: pointer;
-    display: inline-block;
-    min-width: 42px;
+    display: flex;
+    justify-content: flex-end;
+    width: 42px;
 
     &.ScheduleToggle--disabled  {
         cursor: not-allowed;
@@ -32,30 +33,27 @@
 .ScheduleToggle-switch {
     color: @default-link;
     background-color: @default-bg;
-    margin-left: 7px;
     border-left: 1px solid @default-link;
-    margin-right: 0px;
     text-align: center;
     text-transform: uppercase;
     font-size: 11px;
     border-top-right-radius: 4px;
     border-bottom-right-radius: 4px;
-    padding-top: 0px;
+    padding: 0px 5px;
     border-top: 0px;
     border-bottom: 0px;
     border-right: 0px;
-    display: inline-block;
-    height: 22px;
+    height: 16px;
+    line-height: 16px;
 }
 
 .ScheduleToggle.is-on {
     border-color: @default-link;
     background-color: @default-bg;
+    justify-content: flex-start;
 }
 
 .ScheduleToggle-switch.is-on {
-    margin-right: 5px;
-    margin-left: 0px;
     background-color: @default-link;
     color: @default-bg;
     border-left: 0;
@@ -63,6 +61,7 @@
     border-bottom-right-radius: 0px;
     border-top-left-radius: 4px;
     border-bottom-left-radius: 4px;
+    padding: 0 7px;
 }
 
 .ScheduleToggle-switch:hover {
diff --git a/awx/ui/client/src/templates/templates.list.js b/awx/ui/client/src/templates/templates.list.js
index 17534209f2..434825355b 100644
--- a/awx/ui/client/src/templates/templates.list.js
+++ b/awx/ui/client/src/templates/templates.list.js
@@ -76,6 +76,15 @@ export default ['i18n', function(i18n) {
 
             columnClass: 'col-lg-2 col-md-3 col-sm-4 col-xs-3',
 
+            edit: {
+                label: i18n._('Edit'),
+                ngClick: "editJobTemplate(template)",
+                awToolTip: i18n._('Edit template'),
+                "class": 'btn-default btn-xs',
+                dataPlacement: 'top',
+                ngShow: 'template.summary_fields.user_capabilities.edit',
+                editStateParams: ['job_template_id', 'workflow_job_template_id']
+            },
             submit: {
                 // The submit key lets the list generator know that we want to use the
                 // at-launch-template directive
@@ -95,15 +104,6 @@ export default ['i18n', function(i18n) {
                 dataPlacement: 'top',
                 ngShow: 'template.summary_fields.user_capabilities.copy'
             },
-            edit: {
-                label: i18n._('Edit'),
-                ngClick: "editJobTemplate(template)",
-                awToolTip: i18n._('Edit template'),
-                "class": 'btn-default btn-xs',
-                dataPlacement: 'top',
-                ngShow: 'template.summary_fields.user_capabilities.edit',
-                editStateParams: ['job_template_id', 'workflow_job_template_id']
-            },
             view: {
                 label: i18n._('View'),
                 ngClick: "editJobTemplate(template)",
diff --git a/awx/ui/client/src/workflow-results/standard-out.block.less b/awx/ui/client/src/workflow-results/standard-out.block.less
index 980f401c75..c5fad72826 100644
--- a/awx/ui/client/src/workflow-results/standard-out.block.less
+++ b/awx/ui/client/src/workflow-results/standard-out.block.less
@@ -2,122 +2,10 @@
 
 @breakpoint-md: 1180px;
 
-standard-out-log {
-    flex: 5;
-    display: flex;
-    min-height: 0;
-}
-
-.StandardOut-preContent{
-    font-size: 12px;
-    padding: 0 20px 0 20px;
-    font-family: Menlo,Monaco,Consolas,"Courier New",monospace;
-}
-
-.StandardOut-container {
-    .OnePlusOne-container(100%, @breakpoint-md);
-
-    &.fullscreen {
-        .StandardOut-rightPanel {
-            max-width: 100%;
-        }
-    }
-}
-
-.StandardOut-leftPanel {
-    .OnePlusOne-panel--left(100%, @breakpoint-md);
-    max-width: 600px;
-    display: flex;
-    @media (max-width: @breakpoint-md - 1px) {
-        max-width: 100%;
-    }
-
-    .Panel {
-         height: ~"calc(100% - 20px)";
-         overflow-y: scroll;
-    }
-}
-
-.StandardOut-rightPanel {
-    .OnePlusOne-panel--right(100%, @breakpoint-md);
-    max-width: ~"calc(100% - 615px)";
-    @media (max-width: @breakpoint-md - 1px) {
-        padding-right: 15px;
-    }
-
-    .Panel {
-        display: flex;
-        flex-direction: column;
-        height: ~"calc(100% - 20px)";
-    }
-}
-
 .StandardOut-panelHeader {
     .OnePlusOne-panelHeader
 }
 
-.StandardOut-consoleOutput {
-    margin-top: 25px;
-    border-radius: 5px;
-    width: 100%;
-    overflow: auto;
-}
-
-.StandardOut-details {
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: row;
-    padding-top: 25px;
-}
-
-.StandardOut-detailsRow {
-    width: 100%;
-    display: flex;
-    margin: 0 -15px;
-}
-
-.StandardOut-detailsRow + .StandardOut-detailsRow {
-    margin-top: 20px;
-}
-
-.StandardOut-detailsRow--extraVars {
-    margin: 20px 0;
-    width: 100%;
-}
-
-.StandardOut-extraVarsContainer {
-    width: 100%;
-    padding-right: 15px;
-}
-
-.StandardOut-detailsLabel {
-    text-transform: uppercase;
-    color: @default-interface-txt;
-}
-
-.StandardOut-detailsContent {
-    width: 40%;
-    flex: 1 0 auto;
-    padding: 0px 29px;
-    text-transform: none;
-    word-wrap: break-word;
-}
-
-.StandardOut-statusText {
-    margin-left: 6px;
-}
-
-.StandardOut--capitalize {
-    text-transform: capitalize;
-}
-
-.StandardOut-preContainer {
-    height: 100%;
-    border: 1px solid @d7grey;
-    background: @default-secondary-bg;
-    color: @default-interface-txt;
-}
-
 .StandardOut-panelHeaderText {
     align-items: center;
     flex: 1 0 auto;
@@ -130,10 +18,6 @@ standard-out-log {
     font-size: 12px;
 }
 
-.StandardOut-actions {
-    display: flex;
-}
-
 .StandardOut-actionButton {
     font-size: 16px;
     height: 20px;
@@ -160,13 +44,3 @@ standard-out-log {
 .StandardOut-actionButton + a {
     margin-left: 15px;
 }
-
-.StandardOut-seeMoreLess {
-    color: #337AB7;
-    margin: 4px 0px;
-    text-transform: uppercase;
-    padding: 2px 0px;
-    cursor: pointer;
-    border-radius: 5px;
-    font-size: 11px;
-}
\ No newline at end of file

From 127883f104c67095e00de04ea1b0f3429211a728 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Wed, 2 May 2018 01:03:23 -0400
Subject: [PATCH 052/169] add prior version url compatibility

---
 .../features/jobs/jobsList.controller.js      | 26 ++++-----
 .../client/features/jobs/jobsList.view.html   |  2 +-
 .../features/output/details.directive.js      |  2 +-
 .../host-event/host-event-modal.partial.html  | 12 ++--
 .../host-event/host-event.controller.js       | 12 ++--
 .../output/host-event/host-event.route.js     |  8 +--
 awx/ui/client/features/output/index.js        | 42 +++++++-------
 awx/ui/client/features/output/jobs.strings.js |  2 +-
 awx/ui/client/features/output/legacy.route.js | 55 +++++++++++++++++++
 .../client/features/output/render.service.js  |  2 +-
 .../launchTemplateButton.component.js         |  4 +-
 .../lib/components/list/row-item.directive.js |  1 +
 .../lib/components/list/row-item.partial.html |  5 +-
 .../relaunchButton.component.js               | 10 ++--
 .../lists/jobs/jobs-list.directive.js         |  2 +-
 .../inventories/adhoc/adhoc.controller.js     |  2 +-
 .../host-summary-popover.controller.js        |  2 +-
 .../source-summary-popover.controller.js      |  2 +-
 .../factories/view-update-status.factory.js   |  2 +-
 .../adhoc-run.factory.js                      |  2 +-
 .../launchjob.factory.js                      |  2 +-
 .../management-jobs/card/card.controller.js   |  2 +-
 .../organizations-inventories.controller.js   |  2 +-
 .../organizations-projects.controller.js      |  2 +-
 .../projects/list/projects-list.controller.js |  2 +-
 .../smart-status/smart-status.controller.js   |  2 +-
 .../workflow-chart.directive.js               |  6 +-
 27 files changed, 136 insertions(+), 77 deletions(-)
 create mode 100644 awx/ui/client/features/output/legacy.route.js

diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js
index 4959d41b5e..4755638249 100644
--- a/awx/ui/client/features/jobs/jobsList.controller.js
+++ b/awx/ui/client/features/jobs/jobsList.controller.js
@@ -3,8 +3,7 @@
  *
  * All Rights Reserved
  ************************************************ */
-const mapChoices = choices => Object
-    .assign(...choices.map(([k, v]) => ({ [k]: v })));
+const mapChoices = choices => Object.assign(...choices.map(([k, v]) => ({ [k]: v })));
 
 function ListJobsController (
     $scope,
@@ -61,37 +60,36 @@ function ListJobsController (
         vm.emptyListReason = strings.get('list.NO_RUNNING');
     }
 
-    vm.jobTypes = mapChoices(unifiedJob
-        .options('actions.GET.type.choices'));
+    vm.jobTypes = mapChoices(unifiedJob.options('actions.GET.type.choices'));
 
-    vm.getLink = ({ type, id }) => {
-        let link;
+    vm.getSref = ({ type, id }) => {
+        let sref;
 
         switch (type) {
             case 'job':
-                link = `/#/jobz/playbook/${id}`;
+                sref = `output({type: 'playbook', id: ${id}})`;
                 break;
             case 'ad_hoc_command':
-                link = `/#/jobz/command/${id}`;
+                sref = `output({type: 'command', id: ${id}})`;
                 break;
             case 'system_job':
-                link = `/#/jobz/system/${id}`;
+                sref = `output({type: 'system', id: ${id}})`;
                 break;
             case 'project_update':
-                link = `/#/jobz/project/${id}`;
+                sref = `output({type: 'project', id: ${id}})`;
                 break;
             case 'inventory_update':
-                link = `/#/jobz/inventory/${id}`;
+                sref = `output({type: 'inventory', id: ${id}})`;
                 break;
             case 'workflow_job':
-                link = `/#/workflows/${id}`;
+                sref = `workflowResults({id: ${id}})`;
                 break;
             default:
-                link = '';
+                sref = '';
                 break;
         }
 
-        return link;
+        return sref;
     };
 
     vm.deleteJob = (job) => {
diff --git a/awx/ui/client/features/jobs/jobsList.view.html b/awx/ui/client/features/jobs/jobsList.view.html
index d339ee75f1..e550cd879f 100644
--- a/awx/ui/client/features/jobs/jobsList.view.html
+++ b/awx/ui/client/features/jobs/jobsList.view.html
@@ -21,7 +21,7 @@
                     status="{{ job.status }}"
                     status-tip="Job {{job.status}}. Click for details."
                     header-value="{{ job.name }}"
-                    header-link="{{ vm.getLink(job) }}"
+                    header-state="{{ vm.getSref(job) }}"
                     header-tag="{{ vm.jobTypes[job.type] }}">
                 </at-row-item>
                 <div class="at-Row--inline">
diff --git a/awx/ui/client/features/output/details.directive.js b/awx/ui/client/features/output/details.directive.js
index e55f3a8d81..6923aadb36 100644
--- a/awx/ui/client/features/output/details.directive.js
+++ b/awx/ui/client/features/output/details.directive.js
@@ -227,7 +227,7 @@ function getProjectUpdateDetails (updateId) {
         return null;
     }
 
-    const link = `/#/jobz/project/${jobId}`;
+    const link = `/#/jobs/project/${jobId}`;
     const tooltip = strings.get('resourceTooltips.PROJECT_UPDATE');
 
     return { link, tooltip };
diff --git a/awx/ui/client/features/output/host-event/host-event-modal.partial.html b/awx/ui/client/features/output/host-event/host-event-modal.partial.html
index a79b3cde68..47676df842 100644
--- a/awx/ui/client/features/output/host-event/host-event-modal.partial.html
+++ b/awx/ui/client/features/output/host-event/host-event-modal.partial.html
@@ -40,19 +40,19 @@
 
 			<div class="HostEvent-nav">
 				<!-- view navigation buttons -->
-				<button ui-sref="jobz.host-event.json" type="button"
+				<button ui-sref="output.host-event.json" type="button"
 					class="btn btn-sm btn-default HostEvent-tab"
-					ng-class="{'HostEvent-tab--selected' : isActiveState('jobz.host-event.json')}">
+					ng-class="{'HostEvent-tab--selected' : isActiveState('output.host-event.json')}">
 					JSON
 				</button>
-				<button ng-if="stdout" ui-sref="jobz.host-event.stdout"
+				<button ng-if="stdout" ui-sref="output.host-event.stdout"
 					type="button" class="btn btn-sm btn-default HostEvent-tab"
-					ng-class="{'HostEvent-tab--selected' : isActiveState('jobz.host-event.stdout')}">
+					ng-class="{'HostEvent-tab--selected' : isActiveState('output.host-event.stdout')}">
 					Standard Out
 				</button>
-				<button ng-if="stderr" ui-sref="jobz.host-event.stderr"
+				<button ng-if="stderr" ui-sref="output.host-event.stderr"
 					type="button" class="btn btn-sm btn-default HostEvent-tab"
-					ng-class="{'HostEvent-tab--selected' : isActiveState('jobz.host-event.stderr')}">
+					ng-class="{'HostEvent-tab--selected' : isActiveState('output.host-event.stderr')}">
 					Standard Error
 				</button>
 
diff --git a/awx/ui/client/features/output/host-event/host-event.controller.js b/awx/ui/client/features/output/host-event/host-event.controller.js
index a688e59a64..280bf51818 100644
--- a/awx/ui/client/features/output/host-event/host-event.controller.js
+++ b/awx/ui/client/features/output/host-event/host-event.controller.js
@@ -57,7 +57,7 @@ function HostEventsController (
             $scope.stdout = event[0];// eslint-disable-line prefer-destructuring
         }
         // instantiate Codemirror
-        if ($state.current.name === 'jobz.host-event.json') {
+        if ($state.current.name === 'output.host-event.json') {
             try {
                 if (_.has(hostEvent.event_data, 'res')) {
                     initCodeMirror(
@@ -73,14 +73,14 @@ function HostEventsController (
                 // element with id HostEvent-codemirror is not the view
                 // controlled by this instance of HostEventController
             }
-        } else if ($state.current.name === 'jobz.host-event.stdout') {
+        } else if ($state.current.name === 'output.host-event.stdout') {
             try {
                 resize();
             } catch (err) {
                 // element with id HostEvent-codemirror is not the view
                 // controlled by this instance of HostEventController
             }
-        } else if ($state.current.name === 'jobz.host-event.stderr') {
+        } else if ($state.current.name === 'output.host-event.stderr') {
             try {
                 resize();
             } catch (err) {
@@ -98,11 +98,11 @@ function HostEventsController (
         });
 
         function resize () {
-            if ($state.current.name === 'jobz.host-event.json') {
+            if ($state.current.name === 'output.host-event.json') {
                 const editor = $('.CodeMirror')[0].CodeMirror;
                 const height = $('.modal-dialog').height() - $('.HostEvent-header').height() - $('.HostEvent-details').height() - $('.HostEvent-nav').height() - $('.HostEvent-controls').height() - 120;
                 editor.setSize('100%', height);
-            } else if ($state.current.name === 'jobz.host-event.stdout' || $state.current.name === 'jobz.host-event.stderr') {
+            } else if ($state.current.name === 'output.host-event.stdout' || $state.current.name === 'output.host-event.stderr') {
                 const height = $('.modal-dialog').height() - $('.HostEvent-header').height() - $('.HostEvent-details').height() - $('.HostEvent-nav').height() - $('.HostEvent-controls').height() - 120;
                 $('.HostEvent-stdout').width('100%');
                 $('.HostEvent-stdout').height(height);
@@ -154,7 +154,7 @@ function HostEventsController (
         // Unbind the listener so it doesn't fire when we close the modal via navigation
         $('#HostEvent').off('hidden.bs.modal');
         $('#HostEvent').modal('hide');
-        $state.go('jobz');
+        $state.go('output');
     }
     $scope.init = init;
     $scope.init();
diff --git a/awx/ui/client/features/output/host-event/host-event.route.js b/awx/ui/client/features/output/host-event/host-event.route.js
index 105881c778..aba9273327 100644
--- a/awx/ui/client/features/output/host-event/host-event.route.js
+++ b/awx/ui/client/features/output/host-event/host-event.route.js
@@ -25,7 +25,7 @@ HostEventResolve.$inject = [
 ];
 
 const hostEventModal = {
-    name: 'jobz.host-event',
+    name: 'output.host-event',
     url: '/host-event/:eventId',
     controller: 'HostEventsController',
     templateUrl: HostEventModalTemplate,
@@ -40,7 +40,7 @@ const hostEventModal = {
 };
 
 const hostEventJson = {
-    name: 'jobz.host-event.json',
+    name: 'output.host-event.json',
     url: '/json',
     controller: 'HostEventsController',
     templateUrl: HostEventCodeMirrorTemplate,
@@ -50,7 +50,7 @@ const hostEventJson = {
 };
 
 const hostEventStdout = {
-    name: 'jobz.host-event.stdout',
+    name: 'output.host-event.stdout',
     url: '/stdout',
     controller: 'HostEventsController',
     templateUrl: HostEventStdoutTemplate,
@@ -60,7 +60,7 @@ const hostEventStdout = {
 };
 
 const hostEventStderr = {
-    name: 'jobz.host-event.stderr',
+    name: 'output.host-event.stderr',
     url: '/stderr',
     controller: 'HostEventsController',
     templateUrl: HostEventStderrTemplate,
diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js
index 3aaadc2553..12510b4626 100644
--- a/awx/ui/client/features/output/index.js
+++ b/awx/ui/client/features/output/index.js
@@ -8,6 +8,7 @@ import RenderService from '~features/output/render.service';
 import ScrollService from '~features/output/scroll.service';
 import EngineService from '~features/output/engine.service';
 import StatusService from '~features/output/status.service';
+import LegacyRedirect from '~features/output/legacy.route';
 
 import DetailsDirective from '~features/output/details.directive';
 import SearchDirective from '~features/output/search.directive';
@@ -125,12 +126,6 @@ function resolveWebSocketConnection ($stateParams, SocketService) {
     return SocketService.addStateResolve(state, id);
 }
 
-function resolveBreadcrumb (strings) {
-    return {
-        label: strings.get('state.TITLE')
-    };
-}
-
 function getWebSocketResource (type) {
     let name;
     let key;
@@ -163,11 +158,15 @@ function getWebSocketResource (type) {
     return { name, key };
 }
 
-function JobsRun ($stateRegistry) {
+function JobsRun ($stateRegistry, strings) {
+    const parent = 'jobs';
+    const ncyBreadcrumb = { parent, label: strings.get('state.BREADCRUMB_DEFAULT') };
+
     const state = {
-        name: 'jobz',
-        url: '/jobz/:type/:id?job_event_search',
-        route: '/jobz/:type/:id?job_event_search',
+        url: '/:type/:id?job_event_search',
+        name: 'output',
+        parent,
+        ncyBreadcrumb,
         data: {
             activityStream: true,
             activityStreamTarget: 'jobs'
@@ -180,6 +179,11 @@ function JobsRun ($stateRegistry) {
             }
         },
         resolve: {
+            webSocketConnection: [
+                '$stateParams',
+                'SocketService',
+                resolveWebSocketConnection
+            ],
             resource: [
                 'JobModel',
                 'ProjectUpdateModel',
@@ -192,14 +196,11 @@ function JobsRun ($stateRegistry) {
                 'Wait',
                 resolveResource
             ],
-            ncyBreadcrumb: [
-                'JobStrings',
-                resolveBreadcrumb
-            ],
-            webSocketConnection: [
-                '$stateParams',
-                'SocketService',
-                resolveWebSocketConnection
+            breadcrumbLabel: [
+                'resource',
+                ({ model }) => {
+                    ncyBreadcrumb.label = `${model.get('id')} - ${model.get('name')}`;
+                }
             ],
         },
     };
@@ -207,7 +208,7 @@ function JobsRun ($stateRegistry) {
     $stateRegistry.register(state);
 }
 
-JobsRun.$inject = ['$stateRegistry'];
+JobsRun.$inject = ['$stateRegistry', 'JobStrings'];
 
 angular
     .module(MODULE_NAME, [
@@ -224,6 +225,7 @@ angular
     .directive('atJobDetails', DetailsDirective)
     .directive('atJobSearch', SearchDirective)
     .directive('atJobStats', StatsDirective)
-    .run(JobsRun);
+    .run(JobsRun)
+    .run(LegacyRedirect);
 
 export default MODULE_NAME;
diff --git a/awx/ui/client/features/output/jobs.strings.js b/awx/ui/client/features/output/jobs.strings.js
index f1f3ace11d..76584a1f1d 100644
--- a/awx/ui/client/features/output/jobs.strings.js
+++ b/awx/ui/client/features/output/jobs.strings.js
@@ -5,7 +5,7 @@ function JobsStrings (BaseString) {
     const ns = this.jobs;
 
     ns.state = {
-        TITLE: t.s('JOBZ')
+        BREADCRUMB_DEFAULT: t.s('RESULTS'),
     };
 
     ns.warnings = {
diff --git a/awx/ui/client/features/output/legacy.route.js b/awx/ui/client/features/output/legacy.route.js
new file mode 100644
index 0000000000..4abf991dbb
--- /dev/null
+++ b/awx/ui/client/features/output/legacy.route.js
@@ -0,0 +1,55 @@
+function LegacyRedirect ($stateRegistry) {
+    const destination = 'output';
+    const routes = [
+        {
+            name: 'legacyJobResult',
+            url: '/jobs/:id?job_event_search',
+            redirectTo: (trans) => {
+                const {
+                    id,
+                    job_event_search // eslint-disable-line camelcase
+                } = trans.params();
+
+                return { state: destination, params: { type: 'playbook', id, job_event_search } };
+            }
+        },
+        {
+            name: 'legacyAdHocJobStdout',
+            url: '/ad_hoc_commands/:id',
+            redirectTo: (trans) => {
+                const { id } = trans.params();
+                return { state: destination, params: { type: 'command', id } };
+            }
+        },
+        {
+            name: 'legacyInventorySyncStdout',
+            url: '/inventory_sync/:id',
+            redirectTo: (trans) => {
+                const { id } = trans.params();
+                return { state: destination, params: { type: 'inventory', id } };
+            }
+        },
+        {
+            name: 'legacyManagementJobStdout',
+            url: '/management_jobs/:id',
+            redirectTo: (trans) => {
+                const { id } = trans.params();
+                return { state: destination, params: { type: 'system', id } };
+            }
+        },
+        {
+            name: 'legacyScmUpdateStdout',
+            url: '/scm_update/:id',
+            redirectTo: (trans) => {
+                const { id } = trans.params();
+                return { state: destination, params: { type: 'project', id } };
+            }
+        },
+    ];
+
+    routes.forEach(state => $stateRegistry.register(state));
+}
+
+LegacyRedirect.$inject = ['$stateRegistry'];
+
+export default LegacyRedirect;
diff --git a/awx/ui/client/features/output/render.service.js b/awx/ui/client/features/output/render.service.js
index 81728150fe..9981cac65b 100644
--- a/awx/ui/client/features/output/render.service.js
+++ b/awx/ui/client/features/output/render.service.js
@@ -183,7 +183,7 @@ function JobRenderService ($q, $sce, $window) {
             }
 
             if (current.isHost) {
-                tdEvent = `<td class="at-Stdout-event--host" ui-sref="jobz.host-event.json({eventId: ${current.id},  taskUuid: '${current.uuid}' })"><span ng-non-bindable>${content}</span></td>`;
+                tdEvent = `<td class="at-Stdout-event--host" ui-sref="output.host-event.json({eventId: ${current.id},  taskUuid: '${current.uuid}' })"><span ng-non-bindable>${content}</span></td>`;
             }
 
             if (current.time && current.line === ln) {
diff --git a/awx/ui/client/lib/components/launchTemplateButton/launchTemplateButton.component.js b/awx/ui/client/lib/components/launchTemplateButton/launchTemplateButton.component.js
index bd82a2fa10..f8f6734c0e 100644
--- a/awx/ui/client/lib/components/launchTemplateButton/launchTemplateButton.component.js
+++ b/awx/ui/client/lib/components/launchTemplateButton/launchTemplateButton.component.js
@@ -41,7 +41,7 @@ function atLaunchTemplateCtrl (
                         selectedJobTemplate
                             .postLaunch({ id: vm.template.id })
                             .then(({ data }) => {
-                                $state.go('jobz', { id: data.job, type: 'playbook' }, { reload: true });
+                                $state.go('output', { id: data.job, type: 'playbook' }, { reload: true });
                             });
                     } else {
                         const promptData = {
@@ -138,7 +138,7 @@ function atLaunchTemplateCtrl (
                 id: vm.promptData.template,
                 launchData: jobLaunchData
             }).then((launchRes) => {
-                $state.go('jobz', { id: launchRes.data.job, type: 'playbook' }, { reload: true });
+                $state.go('output', { id: launchRes.data.job, type: 'playbook' }, { reload: true });
             }).catch(createErrorHandler('launch job template', 'POST'));
         } else if (vm.promptData.templateType === 'workflow_job_template') {
             workflowTemplate.create().postLaunch({
diff --git a/awx/ui/client/lib/components/list/row-item.directive.js b/awx/ui/client/lib/components/list/row-item.directive.js
index ea116cc5cc..67e169835a 100644
--- a/awx/ui/client/lib/components/list/row-item.directive.js
+++ b/awx/ui/client/lib/components/list/row-item.directive.js
@@ -11,6 +11,7 @@ function atRowItem () {
             badge: '@',
             headerValue: '@',
             headerLink: '@',
+            headerState: '@',
             headerTag: '@',
             status: '@',
             statusTip: '@',
diff --git a/awx/ui/client/lib/components/list/row-item.partial.html b/awx/ui/client/lib/components/list/row-item.partial.html
index 4783993acc..7698ba85a9 100644
--- a/awx/ui/client/lib/components/list/row-item.partial.html
+++ b/awx/ui/client/lib/components/list/row-item.partial.html
@@ -11,7 +11,10 @@
         <div class="at-RowItem-header" ng-if="headerValue && headerLink">
             <a ng-href="{{ headerLink }}">{{ headerValue }}</a>
         </div>
-        <div class="at-RowItem-header" ng-if="headerValue && !headerLink">
+        <div class="at-RowItem-header" ng-if="headerValue && headerState">
+            <a ui-sref="{{ headerState }}" >{{ headerValue }}</a>
+        </div>
+        <div class="at-RowItem-header" ng-if="headerValue && !headerLink && !headerState">
             {{ headerValue }}
         </div>
         <div class="at-RowItem-tag at-RowItem-tag--header" ng-if="headerTag">
diff --git a/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
index 1f258a94ba..cd30c22968 100644
--- a/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
+++ b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
@@ -123,7 +123,7 @@ function atRelaunchCtrl (
                     .then((launchRes) => {
                         if (!$state.is('jobs')) {
                             const relaunchType = launchRes.data.type === 'job' ? 'playbook' : launchRes.data.type;
-                            $state.go('jobz', { id: launchRes.data.id, type: relaunchType }, { reload: true });
+                            $state.go('output', { id: launchRes.data.id, type: relaunchType }, { reload: true });
                         }
                     }).catch(({ data, status, config }) => {
                         ProcessErrors($scope, data, status, null, {
@@ -168,7 +168,7 @@ function atRelaunchCtrl (
                         inventorySource.postUpdate(vm.job.inventory_source)
                             .then((postUpdateRes) => {
                                 if (!$state.is('jobs')) {
-                                    $state.go('jobz', { id: postUpdateRes.data.id, type: 'inventory' }, { reload: true });
+                                    $state.go('output', { id: postUpdateRes.data.id, type: 'inventory' }, { reload: true });
                                 }
                             }).catch(({ data, status, config }) => {
                                 ProcessErrors($scope, data, status, null, {
@@ -192,7 +192,7 @@ function atRelaunchCtrl (
                         project.postUpdate(vm.job.project)
                             .then((postUpdateRes) => {
                                 if (!$state.is('jobs')) {
-                                    $state.go('jobz', { id: postUpdateRes.data.id, type: 'project' }, { reload: true });
+                                    $state.go('output', { id: postUpdateRes.data.id, type: 'project' }, { reload: true });
                                 }
                             }).catch(({ data, status, config }) => {
                                 ProcessErrors($scope, data, status, null, {
@@ -238,7 +238,7 @@ function atRelaunchCtrl (
                         id: vm.job.id
                     }).then((launchRes) => {
                         if (!$state.is('jobs')) {
-                            $state.go('jobz', { id: launchRes.data.id, type: 'command' }, { reload: true });
+                            $state.go('output', { id: launchRes.data.id, type: 'command' }, { reload: true });
                         }
                     }).catch(({ data, status, config }) => {
                         ProcessErrors($scope, data, status, null, {
@@ -263,7 +263,7 @@ function atRelaunchCtrl (
             relaunchData: PromptService.bundlePromptDataForRelaunch(vm.promptData)
         }).then((launchRes) => {
             if (!$state.is('jobs')) {
-                $state.go('jobz', { id: launchRes.data.job, type: 'playbook' }, { reload: true });
+                $state.go('output', { id: launchRes.data.job, type: 'playbook' }, { reload: true });
             }
         }).catch(({ data, status }) => {
             ProcessErrors($scope, data, status, null, {
diff --git a/awx/ui/client/src/home/dashboard/lists/jobs/jobs-list.directive.js b/awx/ui/client/src/home/dashboard/lists/jobs/jobs-list.directive.js
index 93a2147834..e14bc18ab0 100644
--- a/awx/ui/client/src/home/dashboard/lists/jobs/jobs-list.directive.js
+++ b/awx/ui/client/src/home/dashboard/lists/jobs/jobs-list.directive.js
@@ -34,7 +34,7 @@ export default
                 if (job.type === 'workflow_job') {
                     detailsUrl = `/#/workflows/${job.id}`;
                 } else {
-                    detailsUrl = `/#/jobz/playbook/${job.id}`;
+                    detailsUrl = `/#/jobs/playbook/${job.id}`;
                 }
 
                 return {
diff --git a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js
index 33f3a0583f..0d98739305 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js
@@ -241,7 +241,7 @@ function adhocController($q, $scope, $stateParams,
             Rest.post(data)
                 .then(({data}) => {
                      Wait('stop');
-                     $state.go('jobz', {id: data.id, type: 'command'});
+                     $state.go('output', {id: data.id, type: 'command'});
                 })
                 .catch(({data, status}) => {
                     ProcessErrors($scope, data, status, adhocForm, {
diff --git a/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js
index 7b2e28e8aa..77bab5de67 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.controller.js
@@ -23,7 +23,7 @@ export default [ '$scope', 'Empty', 'Wait', 'GetBasePath', 'Rest', 'ProcessError
         };
 
         $scope.viewJob = function(jobId) {
-            $state.go('jobz', { id: jobId, type: 'playbook' });
+            $state.go('output', { id: jobId, type: 'playbook' });
         };
 
     }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js
index 725069044e..70ae7aeacd 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.controller.js
@@ -20,7 +20,7 @@ export default [ '$scope', 'Wait', 'Empty', 'Rest', 'ProcessErrors', '$state',
         $scope.viewJob = function(url) {
             // Pull the id out of the URL
             var id = url.replace(/^\//, '').split('/')[3];
-            $state.go('jobz', { id, type: 'inventory' } );
+            $state.go('output', { id, type: 'inventory' } );
         };
 
     }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js
index c889517506..5b928e5cf5 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/factories/view-update-status.factory.js
@@ -17,7 +17,7 @@ export default
                         // Get the ID from the correct summary field
                         var update_id = (data.summary_fields.current_update) ? data.summary_fields.current_update.id : data.summary_fields.last_update.id;
 
-                        $state.go('jobz', { id: update_id, type: 'inventory' });
+                        $state.go('output', { id: update_id, type: 'inventory' });
                     })
                     .catch(({data, status}) => {
                         ProcessErrors(scope, data, status, null, { hdr: 'Error!',
diff --git a/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js
index 65a7b1c578..debb0c9115 100644
--- a/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js
+++ b/awx/ui/client/src/job-submission/job-submission-factories/adhoc-run.factory.js
@@ -89,7 +89,7 @@
                      .then(({data}) => {
                           Wait('stop');
                           if($location.path().replace(/^\//, '').split('/')[0] !== 'jobs') {
-                              $state.go('jobz', { id: data.id, type: 'command' });
+                              $state.go('output', { id: data.id, type: 'command' });
                           }
                      })
                      .catch(({data, status}) => {
diff --git a/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
index 2e80cdc369..288787a8c8 100644
--- a/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
+++ b/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
@@ -150,7 +150,7 @@ export default
                             // use $state.go with reload: true option to re-instantiate sockets in
 
                             var goTojobResults = function(type) {
-                                $state.go('jobz', {id: job, type}, {reload:true});
+                                $state.go('output', {id: job, type}, {reload:true});
                             };
 
                             if($state.includes('jobs')) {
diff --git a/awx/ui/client/src/management-jobs/card/card.controller.js b/awx/ui/client/src/management-jobs/card/card.controller.js
index 846b95a6ff..5b6bff4f44 100644
--- a/awx/ui/client/src/management-jobs/card/card.controller.js
+++ b/awx/ui/client/src/management-jobs/card/card.controller.js
@@ -94,7 +94,7 @@ export default
                                             Wait('stop');
                                             $("#prompt-for-days").dialog("close");
                                             // $("#configure-dialog").dialog('close');
-                                            $state.go('jobz', { id: data.system_job, type: 'system' }, { reload: true });
+                                            $state.go('output', { id: data.system_job, type: 'system' }, { reload: true });
                                         })
                                         .catch(({data, status}) => {
                                             let template_id = $scope.job_template_id;
diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js
index b26fffb264..57cf501c4d 100644
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js
@@ -234,7 +234,7 @@ export default ['$scope', '$rootScope', '$location',
         $scope.viewJob = function(url) {
             // Pull the id out of the URL
             var id = url.replace(/^\//, '').split('/')[3];
-            $state.go('jobz', { id: id, type: 'inventory' });
+            $state.go('output', { id: id, type: 'inventory' });
 
         };
 
diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
index 853534f142..51e753c8a4 100644
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
@@ -187,7 +187,7 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert',
                 // Grab the id from summary_fields
                 var id = (data.summary_fields.current_update) ? data.summary_fields.current_update.id : data.summary_fields.last_update.id;
 
-                $state.go('jobz', { id: id, type: 'project' });
+                $state.go('output', { id: id, type: 'project' });
 
             } else {
                 Alert('No Updates Available', 'There is no SCM update information available for this project. An update has not yet been ' +
diff --git a/awx/ui/client/src/projects/list/projects-list.controller.js b/awx/ui/client/src/projects/list/projects-list.controller.js
index 2c9525de26..bea12bdf0d 100644
--- a/awx/ui/client/src/projects/list/projects-list.controller.js
+++ b/awx/ui/client/src/projects/list/projects-list.controller.js
@@ -146,7 +146,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
                 // Grab the id from summary_fields
                 var id = (data.summary_fields.current_update) ? data.summary_fields.current_update.id : data.summary_fields.last_update.id;
 
-                $state.go('jobz', { id: id, type: 'project'}, { reload: true });
+                $state.go('output', { id: id, type: 'project'}, { reload: true });
 
             } else {
                 Alert(i18n._('No Updates Available'), i18n._('There is no SCM update information available for this project. An update has not yet been ' +
diff --git a/awx/ui/client/src/smart-status/smart-status.controller.js b/awx/ui/client/src/smart-status/smart-status.controller.js
index 1966e0b68c..1caf92e5ba 100644
--- a/awx/ui/client/src/smart-status/smart-status.controller.js
+++ b/awx/ui/client/src/smart-status/smart-status.controller.js
@@ -27,7 +27,7 @@ export default ['$scope', '$filter',
             if (typeof $scope.templateType !== 'undefined' && $scope.templateType === 'workflow_job_template') {
                 detailsBaseUrl = '/#/workflows/';
             } else {
-                detailsBaseUrl = '/#/jobz/playbook/';
+                detailsBaseUrl = '/#/jobs/playbook/';
             }
 
             var sparkData =
diff --git a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
index 7cfc754d86..dc1db1718c 100644
--- a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
+++ b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.directive.js
@@ -898,13 +898,13 @@ export default ['$state','moment', '$timeout', '$window', '$filter', 'Rest', 'Ge
 
                     let goToJobResults = function(job_type) {
                         if(job_type === 'job') {
-                            $state.go('jobz', {id: d.job.id, type: 'playbook'});
+                            $state.go('output', {id: d.job.id, type: 'playbook'});
                         }
                         else if(job_type === 'inventory_update') {
-                            $state.go('jobz', {id: d.job.id, type: 'inventory'});
+                            $state.go('output', {id: d.job.id, type: 'inventory'});
                         }
                         else if(job_type === 'project_update') {
-                            $state.go('jobz', {id: d.job.id, type: 'project'});
+                            $state.go('output', {id: d.job.id, type: 'project'});
                         }
                     };
 

From ec1e94376c8e86e0efc23bdda06867a69f5c0001 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Wed, 2 May 2018 14:53:05 -0400
Subject: [PATCH 053/169] correctly check credential permission on WFJT copy

---
 awx/api/generics.py |  3 +++
 awx/api/views.py    | 10 ++++++++--
 awx/main/access.py  |  2 +-
 awx/main/tasks.py   |  3 +++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/awx/api/generics.py b/awx/api/generics.py
index eae3fe62f8..c62f3cc6dd 100644
--- a/awx/api/generics.py
+++ b/awx/api/generics.py
@@ -878,6 +878,9 @@ class CopyAPIView(GenericAPIView):
                     obj, field.name, field_val
                 )
         new_obj = model.objects.create(**create_kwargs)
+        logger.debug(six.text_type('Deep copy: Created new object {}({})').format(
+            new_obj, model
+        ))
         # Need to save separatedly because Djang-crum get_current_user would
         # not work properly in non-request-response-cycle context.
         new_obj.created_by = creater
diff --git a/awx/api/views.py b/awx/api/views.py
index 5e080ccea9..07b7576294 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -3702,12 +3702,18 @@ class WorkflowJobTemplateCopy(WorkflowsEnforcementMixin, CopyAPIView):
                 item = getattr(obj, field_name, None)
                 if item is None:
                     continue
-                if field_name in ['inventory']:
+                elif field_name in ['inventory']:
                     if not user.can_access(item.__class__, 'use', item):
                         setattr(obj, field_name, None)
-                if field_name in ['unified_job_template']:
+                elif field_name in ['unified_job_template']:
                     if not user.can_access(item.__class__, 'start', item, validate_license=False):
                         setattr(obj, field_name, None)
+                elif field_name in ['credentials']:
+                    for cred in item.all():
+                        if not user.can_access(cred.__class__, 'use', cred):
+                            logger.debug(six.text_type(
+                                'Deep copy: removing {} from relationship due to permissions').format(cred))
+                            item.remove(cred.pk)
             obj.save()
 
 
diff --git a/awx/main/access.py b/awx/main/access.py
index e2e7d0c3d4..ce3ed5c9f5 100644
--- a/awx/main/access.py
+++ b/awx/main/access.py
@@ -1821,7 +1821,7 @@ class WorkflowJobTemplateAccess(BaseAccess):
                     missing_inventories.append(node.inventory.name)
                 for cred in node.credentials.all():
                     if self.user not in cred.use_role:
-                        missing_credentials.append(node.credential.name)
+                        missing_credentials.append(cred.name)
                 ujt = node.unified_job_template
                 if ujt and not self.user.can_access(UnifiedJobTemplate, 'start', ujt, validate_license=False):
                     missing_ujt.append(ujt.name)
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index aca866ccd0..e260077a61 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -2318,6 +2318,9 @@ def _reconstruct_relationships(copy_mapping):
                 setattr(new_obj, field_name, related_obj)
             elif field.many_to_many:
                 for related_obj in getattr(old_obj, field_name).all():
+                    logger.debug(six.text_type('Deep copy: Adding {} to {}({}).{} relationship').format(
+                        related_obj, new_obj, model, field_name
+                    ))
                     getattr(new_obj, field_name).add(copy_mapping.get(related_obj, related_obj))
         new_obj.save()
 

From 91a24666501c437aa37c4448709931932892ad67 Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Thu, 3 May 2018 10:41:48 -0400
Subject: [PATCH 054/169] Bulk update host field to null for JobEvents

---
 awx/main/tasks.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 31edcc38d7..d9236b5643 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -561,6 +561,8 @@ def delete_inventory(self, inventory_id, user_id):
     with ignore_inventory_computed_fields(), ignore_inventory_group_removal(), impersonate(user):
         try:
             i = Inventory.objects.get(id=inventory_id)
+            for host in i.hosts.iterator():
+                host.job_events_as_primary_host.update(host=None)
             i.delete()
             emit_channel_notification(
                 'inventories-status_changed',

From 42d33e5135246dbdab7010318a4f536012e88adb Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Thu, 3 May 2018 10:58:42 -0400
Subject: [PATCH 055/169] Remove portal mode breadcrumb

---
 awx/ui/client/features/jobs/routes/portalModeMyJobs.route.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/awx/ui/client/features/jobs/routes/portalModeMyJobs.route.js b/awx/ui/client/features/jobs/routes/portalModeMyJobs.route.js
index 07506a553f..4d0909d66b 100644
--- a/awx/ui/client/features/jobs/routes/portalModeMyJobs.route.js
+++ b/awx/ui/client/features/jobs/routes/portalModeMyJobs.route.js
@@ -5,6 +5,9 @@ const jobsListTemplate = require('~features/jobs/jobsList.view.html');
 export default {
     name: 'portalMode.myJobs',
     url: '/myjobs?{job_search:queryset}',
+    ncyBreadcrumb: {
+        skip: true
+    },
     params: {
         job_search: {
             value: {

From 2b1bef54cea94d7f784bf875bbeaedfac057e73e Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Thu, 3 May 2018 00:41:24 -0400
Subject: [PATCH 056/169] add failing unit tests

---
 .../smart-search/queryset.service-test.js     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/awx/ui/test/spec/smart-search/queryset.service-test.js b/awx/ui/test/spec/smart-search/queryset.service-test.js
index bd1f5ae833..eb8563c37d 100644
--- a/awx/ui/test/spec/smart-search/queryset.service-test.js
+++ b/awx/ui/test/spec/smart-search/queryset.service-test.js
@@ -58,6 +58,32 @@ describe('Service: QuerySet', () => {
         });
     });
 
+    describe('getSearchInputQueryset', () => {
+        it('creates the expected queryset', () =>{
+            spyOn(QuerySet, 'encodeParam').and.callThrough();
+
+            const term = 'name:foo';
+            const isFilterableBaseField = () => true;
+            const isRelatedField = () => false;
+
+            expect(QuerySet.getSearchInputQueryset(term, isFilterableBaseField, isRelatedField)).toEqual({ name__icontains_DEFAULT: 'foo' });
+            expect(QuerySet.encodeParam).toHaveBeenCalledWith({ term: "name:foo",  searchTerm: true, singleSearchParam: null });
+        });
+    });
+
+    describe('removeTermsFromQueryset', () => {
+        it('creates the expected queryset', () =>{
+            spyOn(QuerySet, 'encodeParam').and.callThrough();
+
+            const queryset = { page_size: "20", order_by: "name", project__search_DEFAULT: "foo" };
+            const term = 'project:foo';
+            const isFilterableBaseField = () => false;
+            const isRelatedField = () => true;
+
+            expect(QuerySet.removeTermsFromQueryset(queryset, term, isFilterableBaseField, isRelatedField)).toEqual({ page_size: "20", order_by: "name" });
+            expect(QuerySet.encodeParam).toHaveBeenCalledWith({ term: 'project:foo',  relatedSearchTerm: true, singleSearchParam: null });
+        });
+    });
 
     describe('fn search', () => {
         let pattern = /\/api\/v2\/inventories\/(.+)\/groups\/*/,

From 1ed9f609fcb17951d193a89f4934d747029b0f89 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Thu, 3 May 2018 00:42:36 -0400
Subject: [PATCH 057/169] use correct param names when calling encodeParams

---
 .../client/src/shared/smart-search/queryset.service.js   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/shared/smart-search/queryset.service.js b/awx/ui/client/src/shared/smart-search/queryset.service.js
index 7d34a40a4e..ba8aad5dc5 100644
--- a/awx/ui/client/src/shared/smart-search/queryset.service.js
+++ b/awx/ui/client/src/shared/smart-search/queryset.service.js
@@ -104,6 +104,7 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
             }
             let paramString = exclude ? "not__" : "";
             let valueString = paramParts[1];
+
             if(keySplit.length === 1) {
                 if(searchTerm && !lessThanGreaterThan) {
                     if(singleSearchParam) {
@@ -407,9 +408,9 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
                 if (termParts.length === 1) {
                     termParams = searchWithoutKey(term, singleSearchParam);
                 } else if ((isAnsibleFactField && isAnsibleFactField(termParts)) || (isFilterableBaseField && isFilterableBaseField(termParts))) {
-                    termParams = this.encodeParam({ term, singleSearchParam });
+                    termParams = this.encodeParam({ term, singleSearchParam, searchTerm: true });
                 } else if (isRelatedField && isRelatedField(termParts)) {
-                    termParams = this.encodeParam({ term, singleSearchParam, related: true });
+                    termParams = this.encodeParam({ term, singleSearchParam, relatedSearchTerm: true });
                 } else {
                     termParams = searchWithoutKey(term, singleSearchParam);
                 }
@@ -458,9 +459,9 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
             if (termParts.length === 1) {
                 removed = searchWithoutKey(term, singleSearchParam);
             } else if ((isAnsibleFactField && isAnsibleFactField(termParts)) || (isFilterableBaseField && isFilterableBaseField(termParts))) {
-                removed = this.encodeParam({ term, singleSearchParam });
+                removed = this.encodeParam({ term, singleSearchParam, searchTerm: true });
             } else if (isRelatedField && isRelatedField(termParts)) {
-                removed = this.encodeParam({ term, singleSearchParam, related: true });
+                removed = this.encodeParam({ term, singleSearchParam, relatedSearchTerm: true });
             } else {
                 removed = searchWithoutKey(term, singleSearchParam);
             }

From 5668d215fd1175f946c45ed2a2ef0ab66feead36 Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Thu, 3 May 2018 11:44:46 -0400
Subject: [PATCH 058/169] better cluster membership policy log messages

---
 awx/main/tasks.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index cc38360a5d..00252ebdaf 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -146,7 +146,7 @@ def apply_cluster_membership_policies(self):
         # Process policy instance list first, these will represent manually managed instances
         # that will not go through automatic policy determination
         for ig in InstanceGroup.objects.all():
-            logger.info(six.text_type("Considering group {}").format(ig.name))
+            logger.info(six.text_type("Applying cluster membership policies to Group {}").format(ig.name))
             ig.instances.clear()
             group_actual = Group(obj=ig, instances=[])
             for i in ig.policy_instance_list:
@@ -154,7 +154,7 @@ def apply_cluster_membership_policies(self):
                 if not inst.exists():
                     continue
                 inst = inst[0]
-                logger.info(six.text_type("Policy List, adding {} to {}").format(inst.hostname, ig.name))
+                logger.info(six.text_type("Policy List, adding Instance {} to Group {}").format(inst.hostname, ig.name))
                 group_actual.instances.append(inst.id)
                 ig.instances.add(inst)
                 filtered_instances.append(inst)
@@ -167,7 +167,7 @@ def apply_cluster_membership_policies(self):
             for i in sorted(actual_instances, cmp=lambda x,y: len(x.groups) - len(y.groups)):
                 if len(g.instances) >= g.obj.policy_instance_minimum:
                     break
-                logger.info(six.text_type("Policy minimum, adding {} to {}").format(i.obj.hostname, g.obj.name))
+                logger.info(six.text_type("Policy minimum, adding Instance {} to Group {}").format(i.obj.hostname, g.obj.name))
                 g.obj.instances.add(i.obj)
                 g.instances.append(i.obj.id)
                 i.groups.append(g.obj.id)
@@ -176,7 +176,7 @@ def apply_cluster_membership_policies(self):
             for i in sorted(actual_instances, cmp=lambda x,y: len(x.groups) - len(y.groups)):
                 if 100 * float(len(g.instances)) / len(actual_instances) >= g.obj.policy_instance_percentage:
                     break
-                logger.info(six.text_type("Policy percentage, adding {} to {}").format(i.obj.hostname, g.obj.name))
+                logger.info(six.text_type("Policy percentage, adding Instance {} to Group {}").format(i.obj.hostname, g.obj.name))
                 g.instances.append(i.obj.id)
                 g.obj.instances.add(i.obj)
                 i.groups.append(g.obj.id)

From 187534dba8a1c7ee026fb01e047b9f66fbc3c2f3 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Thu, 3 May 2018 13:29:04 -0400
Subject: [PATCH 059/169] Fix job template extra vars form validation

---
 .../job-template-add.controller.js            | 12 +++++++++---
 .../job-template-edit.controller.js           | 19 ++++++++++++-------
 .../job_templates/job-template.form.js        |  2 +-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
index 9efc8e5022..be9ebd5ed3 100644
--- a/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
+++ b/awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
@@ -72,7 +72,13 @@
                 $scope.removeChoicesReady();
             }
             $scope.removeChoicesReady = $scope.$on('choicesReadyVerbosity', function () {
-                ParseTypeChange({ scope: $scope, field_id: 'job_template_variables', onChange: callback });
+                ParseTypeChange({
+                    scope: $scope,
+                    field_id: 'extra_vars',
+                    variable: 'extra_vars',
+                    onChange: callback
+                });
+
                 selectCount++;
                 if (selectCount === 3) {
                     var verbosity;
@@ -279,7 +285,7 @@
                             }
                         }
                         else {
-                            if (fld !== 'variables' &&
+                            if (fld !== 'extra_vars' &&
                                 fld !== 'survey' &&
                                 fld !== 'forks') {
                                 data[fld] = $scope[fld];
@@ -304,7 +310,7 @@
                     delete data.credential;
                     delete data.vault_credential;
 
-                    data.extra_vars = ToJSON($scope.parseType, $scope.variables, true);
+                    data.extra_vars = ToJSON($scope.parseType, $scope.extra_vars, true);
 
                     // We only want to set the survey_enabled flag to
                     // true for this job template if a survey exists
diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
index 2015219988..a5a6a23946 100644
--- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
+++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
@@ -251,7 +251,12 @@ export default
                     default_val: dft
                 });
 
-                ParseTypeChange({ scope: $scope, field_id: 'job_template_variables', onChange: callback });
+                ParseTypeChange({
+                    scope: $scope,
+                    field_id: 'extra_vars',
+                    variable: 'extra_vars',
+                    onChange: callback
+                });
 
                 jobTemplateLoadFinished();
             });
@@ -275,7 +280,7 @@ export default
                 $scope.name = jobTemplateData.name;
                 var fld, i;
                 for (fld in form.fields) {
-                    if (fld !== 'variables' && fld !== 'survey' && fld !== 'forks' && jobTemplateData[fld] !== null && jobTemplateData[fld] !== undefined) {
+                    if (fld !== 'extra_vars' && fld !== 'survey' && fld !== 'forks' && jobTemplateData[fld] !== null && jobTemplateData[fld] !== undefined) {
                         if (form.fields[fld].type === 'select') {
                             if ($scope[fld + '_options'] && $scope[fld + '_options'].length > 0) {
                                 for (i = 0; i < $scope[fld + '_options'].length; i++) {
@@ -300,10 +305,10 @@ export default
                             master[fld] = $scope[fld];
                         }
                     }
-                    if (fld === 'variables') {
+                    if (fld === 'extra_vars') {
                         // Parse extra_vars, converting to YAML.
-                        $scope.variables = ParseVariableString(jobTemplateData.extra_vars);
-                        master.variables = $scope.variables;
+                        $scope.extra_vars = ParseVariableString(jobTemplateData.extra_vars);
+                        master.extra_vars = $scope.extra_vars;
                     }
                     if (form.fields[fld].type === 'lookup' && jobTemplateData.summary_fields[form.fields[fld].sourceModel]) {
                         $scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
@@ -617,7 +622,7 @@ export default
                             }
                         }
                         else {
-                            if (fld !== 'variables' &&
+                            if (fld !== 'extra_vars' &&
                                 fld !== 'survey' &&
                                 fld !== 'forks') {
                                 data[fld] = $scope[fld];
@@ -654,7 +659,7 @@ export default
                         data.vault_credential = null;
                     }
                     data.extra_vars = ToJSON($scope.parseType,
-                        $scope.variables, true);
+                        $scope.extra_vars, true);
 
                     // We only want to set the survey_enabled flag to
                     // true for this job template if a survey exists
diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js
index 4bb46c5b22..0b240a78ee 100644
--- a/awx/ui/client/src/templates/job_templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job_templates/job-template.form.js
@@ -348,7 +348,7 @@ function(NotificationsList, i18n) {
                         alwaysShowAsterisk: true
                     }
                 },
-                variables: {
+                extra_vars: {
                     label: i18n._('Extra Variables'),
                     type: 'textarea',
                     class: 'Form-textAreaLabel Form-formGroup--fullWidth',

From 21a973752b480f4bc7838759685d97bfe857b900 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Thu, 3 May 2018 13:41:12 -0400
Subject: [PATCH 060/169] remove redundant navbar checks

---
 awx/ui/test/e2e/tests/smoke.js | 42 ++++++----------------------------
 1 file changed, 7 insertions(+), 35 deletions(-)

diff --git a/awx/ui/test/e2e/tests/smoke.js b/awx/ui/test/e2e/tests/smoke.js
index cce3e052ea..5e6487742f 100644
--- a/awx/ui/test/e2e/tests/smoke.js
+++ b/awx/ui/test/e2e/tests/smoke.js
@@ -136,10 +136,11 @@ module.exports = {
 
         client.expect.element('#hosts_tab').css('background-color').contain('132, 137, 146');
 
-        client.useCss();
+        client.useXpath();
         client.waitForElementVisible(addHost);
         client.expect.element(addHost).enabled;
         client.click(addHost);
+        client.useCss();
 
         client.waitForElementVisible('#host_name');
         client.sendKeys('#host_name', 'localhost');
@@ -160,16 +161,7 @@ module.exports = {
         const credentials = client.page.credentials();
         const { details } = credentials.section.add.section;
 
-        credentials.section.navigation.waitForElementVisible('@credentials');
-        credentials.section.navigation.expect.element('@credentials').enabled;
-        credentials.section.navigation.click('@credentials');
-
-        credentials.waitForElementVisible('div.spinny');
-        credentials.waitForElementNotVisible('div.spinny');
-
-        credentials.section.list.waitForElementVisible('@add');
-        credentials.section.list.expect.element('@add').enabled;
-        credentials.section.list.click('@add');
+        client.navigateTo(`${credentials.url()}/add`);
 
         details.waitForElementVisible('@save');
         details.clearAndSelectType('Vault');
@@ -185,13 +177,7 @@ module.exports = {
         credentials.waitForElementVisible('div.spinny');
         credentials.waitForElementNotVisible('div.spinny');
 
-        credentials.section.navigation.waitForElementVisible('@credentials');
-        credentials.section.navigation.expect.element('@credentials').enabled;
-        credentials.section.navigation.click('@credentials');
-
-        credentials.section.list.waitForElementVisible('@add');
-        credentials.section.list.expect.element('@add').enabled;
-        credentials.section.list.click('@add');
+        client.navigateTo(`${credentials.url()}/add`);
 
         details.waitForElementVisible('@save');
         details.clearAndSelectType('Vault');
@@ -211,15 +197,7 @@ module.exports = {
         const credentials = client.page.credentials();
         const { details } = credentials.section.add.section;
 
-        credentials.section.navigation.waitForElementVisible('@credentials');
-        credentials.section.navigation.expect.element('@credentials').enabled;
-        credentials.section.navigation.click('@credentials');
-
-        credentials.waitForElementNotVisible('div.spinny');
-
-        credentials.section.list.waitForElementVisible('@add');
-        credentials.section.list.expect.element('@add').enabled;
-        credentials.section.list.click('@add');
+        client.navigateTo(`${credentials.url()}/add`);
 
         details.waitForElementVisible('@save');
         details.clearAndSelectType('Machine');
@@ -235,12 +213,7 @@ module.exports = {
     'create job template': client => {
         const templates = client.page.templates();
 
-        templates.section.navigation.waitForElementVisible('@templates');
-        templates.section.navigation.expect.element('@templates').enabled;
-        templates.section.navigation.click('@templates');
-
-        templates.waitForElementVisible('div.spinny');
-        templates.waitForElementNotVisible('div.spinny');
+        client.navigateTo(templates.url());
 
         templates.selectAdd('Job Template');
         templates.selectInventory(INVENTORY_NAME);
@@ -295,10 +268,9 @@ module.exports = {
         client.waitForElementNotPresent(running, 60000);
         client.waitForElementVisible(success, 60000);
 
-        client.useXpath();
+        client.useCss();
         client.waitForElementVisible(output1, 60000);
         client.waitForElementVisible(output2, 60000);
-        client.useCss();
 
         client.end();
     }

From 6f9da515b15f819663b360848bd4fe9ec3c6cf6b Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Thu, 3 May 2018 13:43:47 -0400
Subject: [PATCH 061/169] Update smoke.js

---
 awx/ui/test/e2e/tests/smoke.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx/ui/test/e2e/tests/smoke.js b/awx/ui/test/e2e/tests/smoke.js
index 5e6487742f..deb80a857f 100644
--- a/awx/ui/test/e2e/tests/smoke.js
+++ b/awx/ui/test/e2e/tests/smoke.js
@@ -136,11 +136,10 @@ module.exports = {
 
         client.expect.element('#hosts_tab').css('background-color').contain('132, 137, 146');
 
-        client.useXpath();
+        client.useCss();
         client.waitForElementVisible(addHost);
         client.expect.element(addHost).enabled;
         client.click(addHost);
-        client.useCss();
 
         client.waitForElementVisible('#host_name');
         client.sendKeys('#host_name', 'localhost');
@@ -268,9 +267,10 @@ module.exports = {
         client.waitForElementNotPresent(running, 60000);
         client.waitForElementVisible(success, 60000);
 
-        client.useCss();
+        client.useXpath();
         client.waitForElementVisible(output1, 60000);
         client.waitForElementVisible(output2, 60000);
+        client.useCss();
 
         client.end();
     }

From af4367b222c8ae9d07c79a6ec915d346e3b3ed85 Mon Sep 17 00:00:00 2001
From: Ben Thomasson <bthomass@redhat.com>
Date: Wed, 4 Apr 2018 12:56:58 -0400
Subject: [PATCH 062/169] Adds unit tests for network_ui

* Covers 100% of non-migration python lines of code
---
 Makefile                                      |   5 +-
 awx/network_ui/consumers.py                   |  41 +-
 awx/network_ui/tests/__init__.py              |   0
 awx/network_ui/tests/unit/__init__.py         |   0
 awx/network_ui/tests/unit/test_consumers.py   | 240 ++++++++++
 awx/network_ui/tests/unit/test_models.py      |  15 +
 .../tests/unit/test_network_events.py         | 451 ++++++++++++++++++
 awx/network_ui/tests/unit/test_routing.py     |   9 +
 awx/network_ui/tests/unit/test_views.py       |  65 +++
 awx/network_ui/views.py                       |  14 -
 10 files changed, 812 insertions(+), 28 deletions(-)
 create mode 100644 awx/network_ui/tests/__init__.py
 create mode 100644 awx/network_ui/tests/unit/__init__.py
 create mode 100644 awx/network_ui/tests/unit/test_consumers.py
 create mode 100644 awx/network_ui/tests/unit/test_models.py
 create mode 100644 awx/network_ui/tests/unit/test_network_events.py
 create mode 100644 awx/network_ui/tests/unit/test_routing.py
 create mode 100644 awx/network_ui/tests/unit/test_views.py

diff --git a/Makefile b/Makefile
index f4e4984b24..4c5202147f 100644
--- a/Makefile
+++ b/Makefile
@@ -372,7 +372,8 @@ awx-link:
 	sed -i "s/placeholder/$(shell git describe --long | sed 's/\./\\./g')/" /awx_devel/awx.egg-info/PKG-INFO
 	cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link
 
-TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests
+TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests awx/network_ui/tests/unit
+
 # Run all API unit tests.
 test:
 	@if [ "$(VENV_BASE)" ]; then \
@@ -386,7 +387,7 @@ test_unit:
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
 	fi; \
-	py.test awx/main/tests/unit awx/conf/tests/unit awx/sso/tests/unit
+	py.test awx/main/tests/unit awx/conf/tests/unit awx/sso/tests/unit awx/network_ui/tests/unit
 
 test_ansible:
 	@if [ "$(VENV_BASE)" ]; then \
diff --git a/awx/network_ui/consumers.py b/awx/network_ui/consumers.py
index 43b0f52005..9cf8c72982 100644
--- a/awx/network_ui/consumers.py
+++ b/awx/network_ui/consumers.py
@@ -1,5 +1,5 @@
 # Copyright (c) 2017 Red Hat, Inc
-from channels import Group
+import channels
 from channels.auth import channel_session_user, channel_session_user_from_http
 from awx.network_ui.models import Topology, Device, Link, Client, Interface
 from awx.network_ui.models import TopologyInventory
@@ -22,6 +22,10 @@ def parse_inventory_id(data):
         inventory_id = int(inventory_id[0])
     except ValueError:
         inventory_id = None
+    except IndexError:
+        inventory_id = None
+    except TypeError:
+        inventory_id = None
     if not inventory_id:
         inventory_id = None
     return inventory_id
@@ -42,10 +46,10 @@ class NetworkingEvents(object):
             message_type = data.pop(0)
             message_value = data.pop(0)
             if isinstance(message_value, list):
-                logger.error("Message has no sender")
+                logger.warning("Message has no sender")
                 return None, None
             if isinstance(message_value, dict) and client_id != message_value.get('sender'):
-                logger.error("client_id mismatch expected: %s actual %s", client_id, message_value.get('sender'))
+                logger.warning("client_id mismatch expected: %s actual %s", client_id, message_value.get('sender'))
                 return None, None
             return message_type, message_value
         else:
@@ -58,11 +62,19 @@ class NetworkingEvents(object):
         of name onX where X is the message type.
         '''
         topology_id = message.get('topology')
-        assert topology_id is not None, "No topology_id"
+        if topology_id is None:
+            logger.warning("Unsupported message %s: no topology", message)
+            return
         client_id = message.get('client')
-        assert client_id is not None, "No client_id"
+        if client_id is None:
+            logger.warning("Unsupported message %s: no client", message)
+            return
+        if 'text' not in message:
+            logger.warning("Unsupported message %s: no data", message)
+            return
         message_type, message_value = self.parse_message_text(message['text'], client_id)
         if message_type is None:
+            logger.warning("Unsupported message %s: no message type", message)
             return
         handler = self.get_handler(message_type)
         if handler is not None:
@@ -98,9 +110,6 @@ class NetworkingEvents(object):
     def onDeviceMove(self, device, topology_id, client_id):
         Device.objects.filter(topology_id=topology_id, cid=device['id']).update(x=device['x'], y=device['y'])
 
-    def onDeviceInventoryUpdate(self, device, topology_id, client_id):
-        Device.objects.filter(topology_id=topology_id, cid=device['id']).update(host_id=device['host_id'])
-
     def onDeviceLabelEdit(self, device, topology_id, client_id):
         logger.debug("Device label edited %s", device)
         Device.objects.filter(topology_id=topology_id, cid=device['id']).update(name=device['name'])
@@ -132,6 +141,12 @@ class NetworkingEvents(object):
         device_map = dict(Device.objects
                                 .filter(topology_id=topology_id, cid__in=[link['from_device_id'], link['to_device_id']])
                                 .values_list('cid', 'pk'))
+        if link['from_device_id'] not in device_map:
+            logger.warning('Device not found')
+            return
+        if link['to_device_id'] not in device_map:
+            logger.warning('Device not found')
+            return
         Link.objects.get_or_create(cid=link['id'],
                                    name=link['name'],
                                    from_device_id=device_map[link['from_device_id']],
@@ -150,8 +165,10 @@ class NetworkingEvents(object):
                                 .filter(topology_id=topology_id, cid__in=[link['from_device_id'], link['to_device_id']])
                                 .values_list('cid', 'pk'))
         if link['from_device_id'] not in device_map:
+            logger.warning('Device not found')
             return
         if link['to_device_id'] not in device_map:
+            logger.warning('Device not found')
             return
         Link.objects.filter(cid=link['id'],
                             from_device_id=device_map[link['from_device_id']],
@@ -212,11 +229,11 @@ def ws_connect(message):
         TopologyInventory(inventory_id=inventory_id, topology_id=topology.pk).save()
     topology_id = topology.pk
     message.channel_session['topology_id'] = topology_id
-    Group("topology-%s" % topology_id).add(message.reply_channel)
+    channels.Group("topology-%s" % topology_id).add(message.reply_channel)
     client = Client()
     client.save()
     message.channel_session['client_id'] = client.pk
-    Group("client-%s" % client.pk).add(message.reply_channel)
+    channels.Group("client-%s" % client.pk).add(message.reply_channel)
     message.reply_channel.send({"text": json.dumps(["id", client.pk])})
     message.reply_channel.send({"text": json.dumps(["topology_id", topology_id])})
     topology_data = transform_dict(dict(id='topology_id',
@@ -278,7 +295,7 @@ def send_snapshot(channel, topology_id):
 @channel_session_user
 def ws_message(message):
     # Send to all clients editing the topology
-    Group("topology-%s" % message.channel_session['topology_id']).send({"text": message['text']})
+    channels.Group("topology-%s" % message.channel_session['topology_id']).send({"text": message['text']})
     # Send to networking_events handler
     networking_events_dispatcher.handle({"text": message['text'],
                                          "topology": message.channel_session['topology_id'],
@@ -288,5 +305,5 @@ def ws_message(message):
 @channel_session_user
 def ws_disconnect(message):
     if 'topology_id' in message.channel_session:
-        Group("topology-%s" % message.channel_session['topology_id']).discard(message.reply_channel)
+        channels.Group("topology-%s" % message.channel_session['topology_id']).discard(message.reply_channel)
 
diff --git a/awx/network_ui/tests/__init__.py b/awx/network_ui/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/awx/network_ui/tests/unit/__init__.py b/awx/network_ui/tests/unit/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/awx/network_ui/tests/unit/test_consumers.py b/awx/network_ui/tests/unit/test_consumers.py
new file mode 100644
index 0000000000..de5c79e105
--- /dev/null
+++ b/awx/network_ui/tests/unit/test_consumers.py
@@ -0,0 +1,240 @@
+
+import mock
+import logging
+import json
+import imp
+from mock import patch
+patch('channels.auth.channel_session_user', lambda x: x).start()
+patch('channels.auth.channel_session_user_from_http', lambda x: x).start()
+
+from awx.network_ui.consumers import parse_inventory_id, networking_events_dispatcher, send_snapshot # noqa
+from awx.network_ui.models import Topology, Device, Link, Interface, TopologyInventory, Client # noqa
+import awx # noqa
+import awx.network_ui # noqa
+import awx.network_ui.consumers # noqa
+imp.reload(awx.network_ui.consumers)
+
+
+def test_parse_inventory_id():
+    assert parse_inventory_id({}) is None
+    assert parse_inventory_id({'inventory_id': ['1']}) == 1
+    assert parse_inventory_id({'inventory_id': ['0']}) is None
+    assert parse_inventory_id({'inventory_id': ['X']}) is None
+    assert parse_inventory_id({'inventory_id': []}) is None
+    assert parse_inventory_id({'inventory_id': 'x'}) is None
+    assert parse_inventory_id({'inventory_id': '12345'}) == 1
+    assert parse_inventory_id({'inventory_id': 1}) is None
+
+
+def test_network_events_handle_message_incomplete_message1():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'warning') as log_mock:
+        networking_events_dispatcher.handle({})
+        log_mock.assert_called_once_with(
+            'Unsupported message %s: no topology', {})
+
+
+def test_network_events_handle_message_incomplete_message2():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'warning') as log_mock:
+        networking_events_dispatcher.handle({'topology': [0]})
+        log_mock.assert_called_once_with(
+            'Unsupported message %s: no client', {'topology': [0]})
+
+
+def test_network_events_handle_message_incomplete_message3():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'warning') as log_mock:
+        networking_events_dispatcher.handle({'topology': [1]})
+        log_mock.assert_called_once_with(
+            'Unsupported message %s: no client', {'topology': [1]})
+
+
+def test_network_events_handle_message_incomplete_message4():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'warning') as log_mock:
+        networking_events_dispatcher.handle({'topology': 1, 'client': 1})
+        log_mock.assert_called_once_with('Unsupported message %s: no data', {
+                                         'client': 1, 'topology': 1})
+
+
+def test_network_events_handle_message_incomplete_message5():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'warning') as log_mock:
+        message = ['DeviceCreate']
+        networking_events_dispatcher.handle(
+            {'topology': 1, 'client': 1, 'text': json.dumps(message)})
+        log_mock.assert_called_once_with('Unsupported message %s: no message type', {
+                                         'text': '["DeviceCreate"]', 'client': 1, 'topology': 1})
+
+
+def test_network_events_handle_message_incomplete_message6():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'warning') as log_mock:
+        message = ['DeviceCreate', []]
+        networking_events_dispatcher.handle(
+            {'topology': 1, 'client': 1, 'text': json.dumps(message)})
+        log_mock.assert_has_calls([
+            mock.call('Message has no sender'),
+            mock.call('Unsupported message %s: no message type', {'text': '["DeviceCreate", []]', 'client': 1, 'topology': 1})])
+
+
+def test_network_events_handle_message_incomplete_message7():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'warning') as log_mock:
+        message = ['DeviceCreate', {}]
+        networking_events_dispatcher.handle(
+            {'topology': 1, 'client': 1, 'text': json.dumps(message)})
+        log_mock.assert_has_calls([
+            mock.call('client_id mismatch expected: %s actual %s', 1, None),
+            mock.call('Unsupported message %s: no message type', {'text': '["DeviceCreate", {}]', 'client': 1, 'topology': 1})])
+
+
+def test_network_events_handle_message_incomplete_message8():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'warning') as log_mock:
+        message = ['Unsupported', {'sender': 1}]
+        networking_events_dispatcher.handle(
+            {'topology': 1, 'client': 1, 'text': json.dumps(message)})
+        log_mock.assert_called_once_with(
+            'Unsupported message %s: no handler', u'Unsupported')
+
+
+def test_send_snapshot_empty():
+    channel = mock.MagicMock()
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device, 'objects'),\
+            mock.patch.object(Link, 'objects'),\
+            mock.patch.object(Interface, 'objects'),\
+            mock.patch.object(Topology, 'objects'):
+        send_snapshot(channel, 1)
+        log_mock.assert_not_called()
+    channel.send.assert_called_once_with(
+        {'text': '["Snapshot", {"links": [], "devices": [], "sender": 0}]'})
+
+
+def test_send_snapshot_single():
+    channel = mock.MagicMock()
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device, 'objects') as device_objects_mock,\
+            mock.patch.object(Link, 'objects'),\
+            mock.patch.object(Interface, 'objects') as interface_objects_mock:
+
+        interface_objects_mock.filter.return_value.values.return_value = [
+            dict(cid=1, device_id=1, id=1, name="eth0")]
+        device_objects_mock.filter.return_value.values.return_value = [
+            dict(cid=1, id=1, device_type="host", name="host1", x=0, y=0,
+                 interface_id_seq=1, host_id=1)]
+        send_snapshot(channel, 1)
+        device_objects_mock.filter.assert_called_once_with(topology_id=1)
+        device_objects_mock.filter.return_value.values.assert_called_once_with()
+        interface_objects_mock.filter.assert_called_once_with(
+            device__topology_id=1)
+        interface_objects_mock.filter.return_value.values.assert_called_once_with()
+        log_mock.assert_not_called()
+        channel.send.assert_called_once_with(
+            {'text': '''["Snapshot", {"links": [], "devices": [{"interface_id_seq": 1, \
+"name": "host1", "interfaces": [{"id": 1, "device_id": 1, "name": "eth0", "interface_id": 1}], \
+"device_type": "host", "host_id": 1, "y": 0, "x": 0, "id": 1, "device_id": 1}], "sender": 0}]'''})
+
+
+def test_ws_disconnect():
+    message = mock.MagicMock()
+    message.channel_session = dict(topology_id=1)
+    message.reply_channel = 'foo'
+    with mock.patch('channels.Group') as group_mock:
+        awx.network_ui.consumers.ws_disconnect(message)
+        group_mock.assert_called_once_with('topology-1')
+        group_mock.return_value.discard.assert_called_once_with('foo')
+
+
+def test_ws_disconnect_no_topology():
+    message = mock.MagicMock()
+    with mock.patch('channels.Group') as group_mock:
+        awx.network_ui.consumers.ws_disconnect(message)
+        group_mock.assert_not_called()
+
+
+def test_ws_message():
+    message = mock.MagicMock()
+    message.channel_session = dict(topology_id=1, client_id=1)
+    message.__getitem__.return_value = json.dumps([])
+    print (message['text'])
+    with mock.patch('channels.Group') as group_mock:
+        awx.network_ui.consumers.ws_message(message)
+        group_mock.assert_called_once_with('topology-1')
+        group_mock.return_value.send.assert_called_once_with({'text': '[]'})
+
+
+def test_ws_connect_unauthenticated():
+    message = mock.MagicMock()
+    message.user.is_authenticated.return_value = False
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch.object(logger, 'error') as log_mock:
+        awx.network_ui.consumers.ws_connect(message)
+        log_mock.assert_called_once_with('Request user is not authenticated to use websocket.')
+
+
+def test_ws_connect_new_topology():
+    message = mock.MagicMock()
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch('awx.network_ui.consumers.Client') as client_mock,\
+            mock.patch('awx.network_ui.consumers.Topology') as topology_mock,\
+            mock.patch('channels.Group'),\
+            mock.patch('awx.network_ui.consumers.send_snapshot') as send_snapshot_mock,\
+            mock.patch.object(logger, 'warning'),\
+            mock.patch.object(TopologyInventory, 'objects'),\
+            mock.patch.object(TopologyInventory, 'save'),\
+            mock.patch.object(Topology, 'save'),\
+            mock.patch.object(Topology, 'objects'),\
+            mock.patch.object(Device, 'objects'),\
+            mock.patch.object(Link, 'objects'),\
+            mock.patch.object(Interface, 'objects'):
+        client_mock.return_value.pk = 777
+        topology_mock.return_value = Topology(
+            name="topology", scale=1.0, panX=0, panY=0, pk=999)
+        awx.network_ui.consumers.ws_connect(message)
+        message.reply_channel.send.assert_has_calls([
+            mock.call({'text': '["id", 777]'}),
+            mock.call({'text': '["topology_id", 999]'}),
+            mock.call(
+                {'text': '["Topology", {"scale": 1.0, "name": "topology", "device_id_seq": 0, "panY": 0, "panX": 0, "topology_id": 999, "link_id_seq": 0}]'}),
+        ])
+        send_snapshot_mock.assert_called_once_with(message.reply_channel, 999)
+
+
+def test_ws_connect_existing_topology():
+    message = mock.MagicMock()
+    logger = logging.getLogger('awx.network_ui.consumers')
+    with mock.patch('awx.network_ui.consumers.Client') as client_mock,\
+            mock.patch('awx.network_ui.consumers.send_snapshot') as send_snapshot_mock,\
+            mock.patch('channels.Group'),\
+            mock.patch.object(logger, 'warning'),\
+            mock.patch.object(TopologyInventory, 'objects') as topology_inventory_objects_mock,\
+            mock.patch.object(TopologyInventory, 'save'),\
+            mock.patch.object(Topology, 'save'),\
+            mock.patch.object(Topology, 'objects') as topology_objects_mock,\
+            mock.patch.object(Device, 'objects'),\
+            mock.patch.object(Link, 'objects'),\
+            mock.patch.object(Interface, 'objects'):
+        topology_inventory_objects_mock.filter.return_value.values_list.return_value = [
+            1]
+        client_mock.return_value.pk = 888
+        topology_objects_mock.get.return_value = Topology(pk=1001,
+                                                          id=1,
+                                                          name="topo",
+                                                          panX=0,
+                                                          panY=0,
+                                                          scale=1.0,
+                                                          link_id_seq=1,
+                                                          device_id_seq=1)
+        awx.network_ui.consumers.ws_connect(message)
+        message.reply_channel.send.assert_has_calls([
+            mock.call({'text': '["id", 888]'}),
+            mock.call({'text': '["topology_id", 1001]'}),
+            mock.call(
+                {'text': '["Topology", {"scale": 1.0, "name": "topo", "device_id_seq": 1, "panY": 0, "panX": 0, "topology_id": 1001, "link_id_seq": 1}]'}),
+        ])
+        send_snapshot_mock.assert_called_once_with(message.reply_channel, 1001)
diff --git a/awx/network_ui/tests/unit/test_models.py b/awx/network_ui/tests/unit/test_models.py
new file mode 100644
index 0000000000..e392662a99
--- /dev/null
+++ b/awx/network_ui/tests/unit/test_models.py
@@ -0,0 +1,15 @@
+
+
+from awx.network_ui.models import Device, Topology, Interface
+
+
+def test_device():
+    assert str(Device(name="foo")) == "foo"
+
+
+def test_topology():
+    assert str(Topology(name="foo")) == "foo"
+
+
+def test_interface():
+    assert str(Interface(name="foo")) == "foo"
diff --git a/awx/network_ui/tests/unit/test_network_events.py b/awx/network_ui/tests/unit/test_network_events.py
new file mode 100644
index 0000000000..d4ce60c7ae
--- /dev/null
+++ b/awx/network_ui/tests/unit/test_network_events.py
@@ -0,0 +1,451 @@
+import mock
+import json
+import logging
+
+from awx.network_ui.consumers import networking_events_dispatcher
+from awx.network_ui.models import Topology, Device, Link, Interface
+
+
+def message(message):
+    def wrapper(fn):
+        fn.tests_message = message
+        return fn
+    return wrapper
+
+
+@message('DeviceMove')
+def test_network_events_handle_message_DeviceMove():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['DeviceMove', dict(
+        msg_type='DeviceMove',
+        sender=1,
+        id=1,
+        x=100,
+        y=100,
+        previous_x=0,
+        previous_y=0
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device, 'objects') as device_objects_mock:
+        networking_events_dispatcher.handle(message)
+        device_objects_mock.filter.assert_called_once_with(
+            cid=1, topology_id=1)
+        device_objects_mock.filter.return_value.update.assert_called_once_with(
+            x=100, y=100)
+        log_mock.assert_not_called()
+
+
+@message('DeviceCreate')
+def test_network_events_handle_message_DeviceCreate():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['DeviceCreate', dict(msg_type='DeviceCreate',
+                                         sender=1,
+                                         id=1,
+                                         x=0,
+                                         y=0,
+                                         name="test_created",
+                                         type='host',
+                                         host_id=None)]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Topology.objects, 'filter') as topology_objects_mock,\
+            mock.patch.object(Device.objects, 'get_or_create') as device_objects_mock:
+        device_mock = mock.MagicMock()
+        filter_mock = mock.MagicMock()
+        device_objects_mock.return_value = [device_mock, True]
+        topology_objects_mock.return_value = filter_mock
+        networking_events_dispatcher.handle(message)
+        device_objects_mock.assert_called_once_with(
+            cid=1,
+            defaults={'name': u'test_created', 'cid': 1, 'device_type': u'host',
+                      'x': 0, 'y': 0, 'host_id': None},
+            topology_id=1)
+        device_mock.save.assert_called_once_with()
+        topology_objects_mock.assert_called_once_with(
+            device_id_seq__lt=1, pk=1)
+        filter_mock.update.assert_called_once_with(device_id_seq=1)
+        log_mock.assert_not_called()
+
+
+@message('DeviceLabelEdit')
+def test_network_events_handle_message_DeviceLabelEdit():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['DeviceLabelEdit', dict(
+        msg_type='DeviceLabelEdit',
+        sender=1,
+        id=1,
+        name='test_changed',
+        previous_name='test_created'
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device.objects, 'filter') as device_objects_filter_mock:
+        networking_events_dispatcher.handle(message)
+        device_objects_filter_mock.assert_called_once_with(
+            cid=1, topology_id=1)
+        log_mock.assert_not_called()
+
+
+@message('DeviceSelected')
+def test_network_events_handle_message_DeviceSelected():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['DeviceSelected', dict(
+        msg_type='DeviceSelected',
+        sender=1,
+        id=1
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock:
+        networking_events_dispatcher.handle(message)
+        log_mock.assert_not_called()
+
+
+@message('DeviceUnSelected')
+def test_network_events_handle_message_DeviceUnSelected():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['DeviceUnSelected', dict(
+        msg_type='DeviceUnSelected',
+        sender=1,
+        id=1
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock:
+        networking_events_dispatcher.handle(message)
+        log_mock.assert_not_called()
+
+
+@message('DeviceDestroy')
+def test_network_events_handle_message_DeviceDestory():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['DeviceDestroy', dict(
+        msg_type='DeviceDestroy',
+        sender=1,
+        id=1,
+        previous_x=0,
+        previous_y=0,
+        previous_name="",
+        previous_type="host",
+        previous_host_id="1")]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device, 'objects') as device_objects_mock:
+        networking_events_dispatcher.handle(message)
+        device_objects_mock.filter.assert_called_once_with(
+            cid=1, topology_id=1)
+        device_objects_mock.filter.return_value.delete.assert_called_once_with()
+        log_mock.assert_not_called()
+
+
+@message('InterfaceCreate')
+def test_network_events_handle_message_InterfaceCreate():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['InterfaceCreate', dict(
+        msg_type='InterfaceCreate',
+        sender=1,
+        device_id=1,
+        id=1,
+        name='eth0'
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device, 'objects') as device_objects_mock,\
+            mock.patch.object(Interface, 'objects') as interface_objects_mock:
+        device_objects_mock.get.return_value.pk = 99
+        networking_events_dispatcher.handle(message)
+        device_objects_mock.get.assert_called_once_with(cid=1, topology_id=1)
+        device_objects_mock.filter.assert_called_once_with(
+            cid=1, interface_id_seq__lt=1, topology_id=1)
+        interface_objects_mock.get_or_create.assert_called_once_with(
+            cid=1, defaults={'name': u'eth0'}, device_id=99)
+        log_mock.assert_not_called()
+
+
+@message('InterfaceLabelEdit')
+def test_network_events_handle_message_InterfaceLabelEdit():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['InterfaceLabelEdit', dict(
+        msg_type='InterfaceLabelEdit',
+        sender=1,
+        id=1,
+        device_id=1,
+        name='new name',
+        previous_name='old name'
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Interface, 'objects') as interface_objects_mock:
+        networking_events_dispatcher.handle(message)
+        interface_objects_mock.filter.assert_called_once_with(
+            cid=1, device__cid=1, device__topology_id=1)
+        interface_objects_mock.filter.return_value.update.assert_called_once_with(
+            name=u'new name')
+        log_mock.assert_not_called()
+
+
+@message('LinkLabelEdit')
+def test_network_events_handle_message_LinkLabelEdit():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['LinkLabelEdit', dict(
+        msg_type='LinkLabelEdit',
+        sender=1,
+        id=1,
+        name='new name',
+        previous_name='old name'
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Link, 'objects') as link_objects_mock:
+        networking_events_dispatcher.handle(message)
+        link_objects_mock.filter.assert_called_once_with(
+            cid=1, from_device__topology_id=1)
+        link_objects_mock.filter.return_value.update.assert_called_once_with(
+            name=u'new name')
+        log_mock.assert_not_called()
+
+
+@message('LinkCreate')
+def test_network_events_handle_message_LinkCreate():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['LinkCreate', dict(
+        msg_type='LinkCreate',
+        id=1,
+        sender=1,
+        name="",
+        from_device_id=1,
+        to_device_id=2,
+        from_interface_id=1,
+        to_interface_id=1
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device, 'objects') as device_objects_mock,\
+            mock.patch.object(Link, 'objects') as link_objects_mock,\
+            mock.patch.object(Interface, 'objects') as interface_objects_mock,\
+            mock.patch.object(Topology, 'objects') as topology_objects_mock:
+        values_list_mock = mock.MagicMock()
+        values_list_mock.values_list.return_value = [(1,1), (2,2)]
+        interface_objects_mock.get.return_value = mock.MagicMock()
+        interface_objects_mock.get.return_value.pk = 7
+        device_objects_mock.filter.return_value = values_list_mock
+        topology_objects_mock.filter.return_value = mock.MagicMock()
+        networking_events_dispatcher.handle(message)
+        device_objects_mock.filter.assert_called_once_with(
+            cid__in=[1, 2], topology_id=1)
+        values_list_mock.values_list.assert_called_once_with('cid', 'pk')
+        link_objects_mock.get_or_create.assert_called_once_with(
+            cid=1, from_device_id=1, from_interface_id=7, name=u'',
+            to_device_id=2, to_interface_id=7)
+        topology_objects_mock.filter.assert_called_once_with(
+            link_id_seq__lt=1, pk=1)
+        topology_objects_mock.filter.return_value.update.assert_called_once_with(
+            link_id_seq=1)
+        log_mock.assert_not_called()
+
+
+@message('LinkCreate')
+def test_network_events_handle_message_LinkCreate_bad_device1():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['LinkCreate', dict(
+        msg_type='LinkCreate',
+        id=1,
+        sender=1,
+        name="",
+        from_device_id=1,
+        to_device_id=2,
+        from_interface_id=1,
+        to_interface_id=1
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device, 'objects') as device_objects_mock,\
+            mock.patch.object(Link, 'objects'),\
+            mock.patch.object(Interface, 'objects') as interface_objects_mock,\
+            mock.patch.object(Topology, 'objects') as topology_objects_mock:
+        values_list_mock = mock.MagicMock()
+        values_list_mock.values_list.return_value = [(9,1), (2,2)]
+        interface_objects_mock.get.return_value = mock.MagicMock()
+        interface_objects_mock.get.return_value.pk = 7
+        device_objects_mock.filter.return_value = values_list_mock
+        topology_objects_mock.filter.return_value = mock.MagicMock()
+        networking_events_dispatcher.handle(message)
+        device_objects_mock.filter.assert_called_once_with(
+            cid__in=[1, 2], topology_id=1)
+        values_list_mock.values_list.assert_called_once_with('cid', 'pk')
+        log_mock.assert_called_once_with('Device not found')
+
+
+@message('LinkCreate')
+def test_network_events_handle_message_LinkCreate_bad_device2():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['LinkCreate', dict(
+        msg_type='LinkCreate',
+        id=1,
+        sender=1,
+        name="",
+        from_device_id=1,
+        to_device_id=2,
+        from_interface_id=1,
+        to_interface_id=1
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device, 'objects') as device_objects_mock,\
+            mock.patch.object(Link, 'objects'),\
+            mock.patch.object(Interface, 'objects') as interface_objects_mock,\
+            mock.patch.object(Topology, 'objects') as topology_objects_mock:
+        values_list_mock = mock.MagicMock()
+        values_list_mock.values_list.return_value = [(1,1), (9,2)]
+        interface_objects_mock.get.return_value = mock.MagicMock()
+        interface_objects_mock.get.return_value.pk = 7
+        device_objects_mock.filter.return_value = values_list_mock
+        topology_objects_mock.filter.return_value = mock.MagicMock()
+        networking_events_dispatcher.handle(message)
+        device_objects_mock.filter.assert_called_once_with(
+            cid__in=[1, 2], topology_id=1)
+        values_list_mock.values_list.assert_called_once_with('cid', 'pk')
+        log_mock.assert_called_once_with('Device not found')
+
+
+@message('LinkDestroy')
+def test_network_events_handle_message_LinkDestroy():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['LinkDestroy', dict(
+        msg_type='LinkDestroy',
+        id=1,
+        sender=1,
+        name="",
+        from_device_id=1,
+        to_device_id=2,
+        from_interface_id=1,
+        to_interface_id=1
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device.objects, 'filter') as device_filter_mock,\
+            mock.patch.object(Link.objects, 'filter') as link_filter_mock,\
+            mock.patch.object(Interface.objects, 'get') as interface_get_mock:
+        values_mock = mock.MagicMock()
+        interface_get_mock.return_value = mock.MagicMock()
+        interface_get_mock.return_value.pk = 7
+        device_filter_mock.return_value = values_mock
+        values_mock.values_list.return_value = [(1,1), (2,2)]
+        networking_events_dispatcher.handle(message)
+        device_filter_mock.assert_called_once_with(
+            cid__in=[1, 2], topology_id=1)
+        values_mock.values_list.assert_called_once_with('cid', 'pk')
+        link_filter_mock.assert_called_once_with(
+            cid=1, from_device_id=1, from_interface_id=7, to_device_id=2, to_interface_id=7)
+        log_mock.assert_not_called()
+
+
+@message('LinkDestroy')
+def test_network_events_handle_message_LinkDestroy_bad_device_map1():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['LinkDestroy', dict(
+        msg_type='LinkDestroy',
+        id=1,
+        sender=1,
+        name="",
+        from_device_id=1,
+        to_device_id=2,
+        from_interface_id=1,
+        to_interface_id=1
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device.objects, 'filter') as device_filter_mock,\
+            mock.patch.object(Link.objects, 'filter'),\
+            mock.patch.object(Interface.objects, 'get') as interface_get_mock:
+        values_mock = mock.MagicMock()
+        interface_get_mock.return_value = mock.MagicMock()
+        interface_get_mock.return_value.pk = 7
+        device_filter_mock.return_value = values_mock
+        values_mock.values_list.return_value = [(9,1), (2,2)]
+        networking_events_dispatcher.handle(message)
+        log_mock.assert_called_once_with('Device not found')
+
+
+@message('LinkDestroy')
+def test_network_events_handle_message_LinkDestroy_bad_device_map2():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['LinkDestroy', dict(
+        msg_type='LinkDestroy',
+        id=1,
+        sender=1,
+        name="",
+        from_device_id=1,
+        to_device_id=2,
+        from_interface_id=1,
+        to_interface_id=1
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock,\
+            mock.patch.object(Device.objects, 'filter') as device_filter_mock,\
+            mock.patch.object(Link.objects, 'filter'),\
+            mock.patch.object(Interface.objects, 'get') as interface_get_mock:
+        values_mock = mock.MagicMock()
+        interface_get_mock.return_value = mock.MagicMock()
+        interface_get_mock.return_value.pk = 7
+        device_filter_mock.return_value = values_mock
+        values_mock.values_list.return_value = [(1,1), (9,2)]
+        networking_events_dispatcher.handle(message)
+        log_mock.assert_called_once_with('Device not found')
+
+
+@message('LinkSelected')
+def test_network_events_handle_message_LinkSelected():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['LinkSelected', dict(
+        msg_type='LinkSelected',
+        sender=1,
+        id=1
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock:
+        networking_events_dispatcher.handle(message)
+        log_mock.assert_not_called()
+
+
+@message('LinkUnSelected')
+def test_network_events_handle_message_LinkUnSelected():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['LinkUnSelected', dict(
+        msg_type='LinkUnSelected',
+        sender=1,
+        id=1
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock:
+        networking_events_dispatcher.handle(message)
+        log_mock.assert_not_called()
+
+
+@message('MultipleMessage')
+def test_network_events_handle_message_MultipleMessage_unsupported_message():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['MultipleMessage', dict(
+        msg_type='MultipleMessage',
+        sender=1,
+        messages=[dict(msg_type="Unsupported")]
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock:
+        networking_events_dispatcher.handle(message)
+        log_mock.assert_called_once_with(
+            'Unsupported message %s', u'Unsupported')
+
+
+@message('MultipleMessage')
+def test_network_events_handle_message_MultipleMessage():
+    logger = logging.getLogger('awx.network_ui.consumers')
+    message_data = ['MultipleMessage', dict(
+        msg_type='MultipleMessage',
+        sender=1,
+        messages=[dict(msg_type="DeviceSelected")]
+    )]
+    message = {'topology': 1, 'client': 1, 'text': json.dumps(message_data)}
+    with mock.patch.object(logger, 'warning') as log_mock:
+        networking_events_dispatcher.handle(message)
+        log_mock.assert_not_called()
diff --git a/awx/network_ui/tests/unit/test_routing.py b/awx/network_ui/tests/unit/test_routing.py
new file mode 100644
index 0000000000..d1d7a741dd
--- /dev/null
+++ b/awx/network_ui/tests/unit/test_routing.py
@@ -0,0 +1,9 @@
+
+import awx.network_ui.routing
+
+
+def test_routing():
+    '''
+    Tests that the number of routes in awx.network_ui.routing is 3.
+    '''
+    assert len(awx.network_ui.routing.channel_routing) == 3
diff --git a/awx/network_ui/tests/unit/test_views.py b/awx/network_ui/tests/unit/test_views.py
new file mode 100644
index 0000000000..9b55ad72d4
--- /dev/null
+++ b/awx/network_ui/tests/unit/test_views.py
@@ -0,0 +1,65 @@
+
+import mock
+
+from awx.network_ui.views import topology_data, NetworkAnnotatedInterface, json_topology_data, yaml_topology_data
+from awx.network_ui.models import Topology, Device, Link, Interface
+
+
+
+def test_topology_data():
+    with mock.patch.object(Topology, 'objects'),\
+            mock.patch.object(Device, 'objects') as device_objects_mock,\
+            mock.patch.object(Link, 'objects') as link_objects_mock,\
+            mock.patch.object(Interface, 'objects'),\
+            mock.patch.object(NetworkAnnotatedInterface, 'filter'):
+        device_objects_mock.filter.return_value.order_by.return_value = [
+            Device(pk=1), Device(pk=2)]
+        link_objects_mock.filter.return_value = [Link(from_device=Device(name='from', cid=1),
+                                                      to_device=Device(
+                                                          name='to', cid=2),
+                                                      from_interface=Interface(
+                                                          name="eth0", cid=1),
+                                                      to_interface=Interface(
+                                                          name="eth0", cid=1),
+                                                      name="",
+                                                      pk=1
+                                                      )]
+        data = topology_data(1)
+        assert len(data['devices']) == 2
+        assert len(data['links']) == 1
+
+
+def test_json_topology_data():
+    request = mock.MagicMock()
+    request.GET = dict(topology_id=1)
+    with mock.patch('awx.network_ui.views.topology_data') as topology_data_mock:
+        topology_data_mock.return_value = dict()
+        json_topology_data(request)
+        topology_data_mock.assert_called_once_with(1)
+
+
+def test_yaml_topology_data():
+    request = mock.MagicMock()
+    request.GET = dict(topology_id=1)
+    with mock.patch('awx.network_ui.views.topology_data') as topology_data_mock:
+        topology_data_mock.return_value = dict()
+        yaml_topology_data(request)
+        topology_data_mock.assert_called_once_with(1)
+
+
+def test_json_topology_data_no_topology_id():
+    request = mock.MagicMock()
+    request.GET = dict()
+    with mock.patch('awx.network_ui.views.topology_data') as topology_data_mock:
+        topology_data_mock.return_value = dict()
+        json_topology_data(request)
+        topology_data_mock.assert_not_called()
+
+
+def test_yaml_topology_data_no_topology_id():
+    request = mock.MagicMock()
+    request.GET = dict()
+    with mock.patch('awx.network_ui.views.topology_data') as topology_data_mock:
+        topology_data_mock.return_value = dict()
+        yaml_topology_data(request)
+        topology_data_mock.assert_not_called()
diff --git a/awx/network_ui/views.py b/awx/network_ui/views.py
index 577b8c004f..b9cd476bcc 100644
--- a/awx/network_ui/views.py
+++ b/awx/network_ui/views.py
@@ -1,11 +1,9 @@
 # Copyright (c) 2017 Red Hat, Inc
-from django.shortcuts import render
 from django import forms
 from django.http import JsonResponse, HttpResponseBadRequest, HttpResponse
 from awx.network_ui.models import Topology, Device, Link, Interface
 from django.db.models import Q
 import yaml
-import json
 
 NetworkAnnotatedInterface = Interface.objects.values('name',
                                                      'cid',
@@ -63,18 +61,6 @@ def topology_data(topology_id):
         return data
 
 
-def yaml_serialize_topology(topology_id):
-    return yaml.safe_dump(topology_data(topology_id), default_flow_style=False)
-
-
-def json_serialize_topology(topology_id):
-    return json.dumps(topology_data(topology_id))
-
-
-def index(request):
-    return render(request, "network_ui/index.html", dict(topologies=Topology.objects.all().order_by('-pk')))
-
-
 class TopologyForm(forms.Form):
     topology_id = forms.IntegerField()
 

From 34408a8ef9b5f39c7de88186270a00b1d038187d Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Thu, 3 May 2018 14:29:17 -0400
Subject: [PATCH 063/169] Fix undefined currentSystem form error

---
 awx/ui/client/src/configuration/configuration.controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/configuration/configuration.controller.js b/awx/ui/client/src/configuration/configuration.controller.js
index db0696ddaf..0f65097f71 100644
--- a/awx/ui/client/src/configuration/configuration.controller.js
+++ b/awx/ui/client/src/configuration/configuration.controller.js
@@ -278,7 +278,7 @@ export default [
                 if (setForm === 'auth') {
                     formTracker.setCurrentAuth(formTracker.currentAuth);
                 } else if (setForm === 'system') {
-                    formTracker.setCurrentSystem(formTracker.currenSystem);
+                    formTracker.setCurrentSystem(formTracker.currentSystem);
                 } else {
                     formTracker.setCurrent(setForm);
                 }

From 5ada6f6db20e4b9af33f28006e565df4a8876582 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Thu, 3 May 2018 14:33:05 -0400
Subject: [PATCH 064/169] show job and skip tags as collapsable label lists

---
 .../features/output/details.directive.js      | 70 ++++++++++++++++---
 .../features/output/details.partial.html      | 66 +++++++++++++----
 2 files changed, 111 insertions(+), 25 deletions(-)

diff --git a/awx/ui/client/features/output/details.directive.js b/awx/ui/client/features/output/details.directive.js
index 36a0d5c16b..4808798ffe 100644
--- a/awx/ui/client/features/output/details.directive.js
+++ b/awx/ui/client/features/output/details.directive.js
@@ -367,25 +367,49 @@ function getInstanceGroupDetails () {
 }
 
 function getJobTagDetails () {
-    const label = 'Job Tags';
-    const value = resource.model.get('job_tags');
+    const tagString = resource.model.get('job_tags');
 
-    if (!value) {
+    let jobTags;
+
+    if (tagString) {
+        jobTags = tagString.split(',');
+    } else {
+        jobTags = [];
+    }
+
+    if (jobTags.length < 1) {
         return null;
     }
 
-    return { label, value };
+    const label = 'Job Tags';
+    const more = false;
+
+    const value = jobTags.map($filter('sanitize'));
+
+    return { label, more, value };
 }
 
 function getSkipTagDetails () {
-    const label = 'Skip Tags';
-    const value = resource.model.get('skip_tags');
+    const tagString = resource.model.get('skip_tags');
 
-    if (!value) {
+    let skipTags;
+
+    if (tagString) {
+        skipTags = tagString.split(',');
+    } else {
+        skipTags = [];
+    }
+
+    if (skipTags.length < 1) {
         return null;
     }
 
-    return { label, value };
+    const label = 'Skip Tags';
+    const more = false;
+
+    const value = skipTags.map($filter('sanitize'));
+
+    return { label, more, value };
 }
 
 function getExtraVarsDetails () {
@@ -428,19 +452,41 @@ function createErrorHandler (path, action) {
 }
 
 const ELEMENT_LABELS = '#job-results-labels';
+const ELEMENT_JOB_TAGS = '#job-results-job-tags';
+const ELEMENT_SKIP_TAGS = '#job-results-skip-tags';
 const ELEMENT_PROMPT_MODAL = '#prompt-modal';
-const LABELS_SLIDE_DISTANCE = 200;
+const TAGS_SLIDE_DISTANCE = 200;
 
 function toggleLabels () {
     if (!this.labels.more) {
-        $(ELEMENT_LABELS).slideUp(LABELS_SLIDE_DISTANCE);
+        $(ELEMENT_LABELS).slideUp(TAGS_SLIDE_DISTANCE);
         this.labels.more = true;
     } else {
-        $(ELEMENT_LABELS).slideDown(LABELS_SLIDE_DISTANCE);
+        $(ELEMENT_LABELS).slideDown(TAGS_SLIDE_DISTANCE);
         this.labels.more = false;
     }
 }
 
+function toggleJobTags () {
+    if (!this.jobTags.more) {
+        $(ELEMENT_JOB_TAGS).slideUp(TAGS_SLIDE_DISTANCE);
+        this.jobTags.more = true;
+    } else {
+        $(ELEMENT_JOB_TAGS).slideDown(TAGS_SLIDE_DISTANCE);
+        this.jobTags.more = false;
+    }
+}
+
+function toggleSkipTags () {
+    if (!this.skipTags.more) {
+        $(ELEMENT_SKIP_TAGS).slideUp(TAGS_SLIDE_DISTANCE);
+        this.skipTags.more = true;
+    } else {
+        $(ELEMENT_SKIP_TAGS).slideDown(TAGS_SLIDE_DISTANCE);
+        this.skipTags.more = false;
+    }
+}
+
 function cancelJob () {
     const actionText = strings.get('cancelJob.CANCEL_JOB');
     const hdr = strings.get('cancelJob.HEADER');
@@ -562,6 +608,8 @@ function AtJobDetailsController (
         vm.cancelJob = cancelJob;
         vm.deleteJob = deleteJob;
         vm.toggleLabels = toggleLabels;
+        vm.toggleJobTags = toggleJobTags;
+        vm.toggleSkipTags = toggleSkipTags;
 
         const observe = (getter, transform, key) => {
             $scope.$watch(getter, value => { vm[key] = transform(value); });
diff --git a/awx/ui/client/features/output/details.partial.html b/awx/ui/client/features/output/details.partial.html
index 5eb4f5b146..65e35278b0 100644
--- a/awx/ui/client/features/output/details.partial.html
+++ b/awx/ui/client/features/output/details.partial.html
@@ -237,18 +237,6 @@
     </div>
 </div>
 
-<!-- TAGS DETAIL -->
-<div class="JobResults-resultRow" ng-if="vm.jobTags">
-    <label class="JobResults-resultRowLabel">{{ vm.jobTags.label }}</label>
-    <div class="JobResults-resultRowText">{{ vm.jobTags.value }}</div>
-</div>
-
-<!-- SKIP TAGS DETAIL -->
-<div class="JobResults-resultRow" ng-if="vm.skipTags">
-    <label class="JobResults-resultRowLabel">{{ vm.skipTags.label }}</label>
-    <div class="JobResults-resultRowText"> {{ vm.skipTags.value }}</div>
-</div>
-
 <!-- EXTRA VARIABLES DETAIL -->
 <at-code-mirror
     class="JobResults-resultRow"
@@ -267,14 +255,14 @@
             ng-show="vm.labels.more"
             href=""
             ng-click="vm.toggleLabels()">
-            <span translate>Labels</span>
+            <span translate>{{ vm.labels.label }}</span>
             <i class="JobResults-expandArrow fa fa-caret-right"></i>
         </a>
         <a class="JobResults-resultRowLabel JobResults-resultRowLabel--fullWidth"
             ng-show="!vm.labels.more"
             href=""
             ng-click="vm.toggleLabels()">
-            <span translate>Labels</span>
+            <span translate>{{ vm.labels.label }}</span>
             <i class="JobResults-expandArrow fa fa-caret-down"></i>
         </a>
     </div>
@@ -284,3 +272,53 @@
         </div>
     </div>
 </div>
+
+<!-- TAGS DETAIL -->
+<div class="JobResults-resultRow" ng-show="vm.jobTags">
+    <div class="JobResults-resultRow">
+        <a class="JobResults-resultRowLabel JobResults-resultRowLabel--fullWidth"
+            ng-show="vm.jobTags.more"
+            href=""
+            ng-click="vm.toggleJobTags()">
+            <span translate>{{ vm.jobTags.label }}</span>
+            <i class="JobResults-expandArrow fa fa-caret-right"></i>
+        </a>
+        <a class="JobResults-resultRowLabel JobResults-resultRowLabel--fullWidth"
+            ng-show="!vm.jobTags.more"
+            href=""
+            ng-click="vm.toggleJobTags()">
+            <span translate>{{ vm.jobTags.label }}</span>
+            <i class="JobResults-expandArrow fa fa-caret-down"></i>
+        </a>
+    </div>
+    <div id="job-results-job-tags" class="LabelList JobResults-resultRowText JobResults-resultRowText--fullWidth">
+        <div ng-repeat="tag in vm.jobTags.value" class="LabelList-tagContainer">
+            <div class="LabelList-tag"><div class="LabelList-name">{{ tag }}</div></div>
+        </div>
+    </div>
+</div>
+
+<!-- SKIP TAGS DETAIL -->
+<div class="JobResults-resultRow" ng-show="vm.skipTags">
+    <div class="JobResults-resultRow">
+        <a class="JobResults-resultRowLabel JobResults-resultRowLabel--fullWidth"
+            ng-show="vm.skipTags.more"
+            href=""
+            ng-click="vm.toggleSkipTags()">
+            <span translate>{{ vm.skipTags.label }}</span>
+            <i class="JobResults-expandArrow fa fa-caret-right"></i>
+        </a>
+        <a class="JobResults-resultRowLabel JobResults-resultRowLabel--fullWidth"
+            ng-show="!vm.skipTags.more"
+            href=""
+            ng-click="vm.toggleSkipTags()">
+            <span translate>{{ vm.skipTags.label }}</span>
+            <i class="JobResults-expandArrow fa fa-caret-down"></i>
+        </a>
+    </div>
+    <div id="job-results-skip-tags" class="LabelList JobResults-resultRowText JobResults-resultRowText--fullWidth">
+        <div ng-repeat="tag in vm.skipTags.value" class="LabelList-tagContainer">
+            <div class="LabelList-tag"><div class="LabelList-name">{{ tag }}</div></div>
+        </div>
+    </div>
+</div>

From 0682d19d5ebe37d7cdef2314e1b35dda1f27511f Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Thu, 3 May 2018 16:45:09 -0400
Subject: [PATCH 065/169] show filterable:true for filterable fields

---
 awx/api/metadata.py                                | 14 +++++---------
 awx/main/tests/functional/api/test_generic.py      | 12 +++++++++---
 .../shared/smart-search/smart-search.controller.js |  9 +++++----
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/awx/api/metadata.py b/awx/api/metadata.py
index ebeb5f3286..e11474f27b 100644
--- a/awx/api/metadata.py
+++ b/awx/api/metadata.py
@@ -62,15 +62,11 @@ class Metadata(metadata.SimpleMetadata):
                 opts = serializer.Meta.model._meta.concrete_model._meta
                 verbose_name = smart_text(opts.verbose_name)
                 field_info['help_text'] = field_help_text[field.field_name].format(verbose_name)
-            # If field is not part of the model, then show it as non-filterable
-            else:
-                is_model_field = False
-                for model_field in serializer.Meta.model._meta.fields:
-                    if field.field_name == model_field.name:
-                        is_model_field = True
-                        break
-                if not is_model_field:
-                    field_info['filterable'] = False
+
+            for model_field in serializer.Meta.model._meta.fields:
+                if field.field_name == model_field.name:
+                    field_info['filterable'] = True
+                    break
 
         # Indicate if a field has a default value.
         # FIXME: Still isn't showing all default values?
diff --git a/awx/main/tests/functional/api/test_generic.py b/awx/main/tests/functional/api/test_generic.py
index f445ee73f7..68ca294027 100644
--- a/awx/main/tests/functional/api/test_generic.py
+++ b/awx/main/tests/functional/api/test_generic.py
@@ -94,10 +94,16 @@ class TestDeleteViews:
 
 
 @pytest.mark.django_db
-def test_non_filterable_field(options, instance, admin_user):
+def test_filterable_fields(options, instance, admin_user):
     r = options(
         url=instance.get_absolute_url(),
         user=admin_user
     )
-    field_info = r.data['actions']['GET']['percent_capacity_remaining']
-    assert 'filterable' in field_info
+
+    filterable_info = r.data['actions']['GET']['created']
+    non_filterable_info = r.data['actions']['GET']['percent_capacity_remaining']
+
+    assert 'filterable' in filterable_info
+    assert filterable_info['filterable'] is True
+
+    assert 'filterable' not in non_filterable_info
diff --git a/awx/ui/client/src/shared/smart-search/smart-search.controller.js b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
index fb0a4c0701..ba481cec6e 100644
--- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
@@ -53,7 +53,7 @@ function SmartSearchController (
                 $scope.models = data.models;
                 $scope.options = data.options.data;
                 $scope.keyFields = _.reduce(data.models[$scope.djangoModel].base, function(result, value, key) {
-                    if (!(typeof value.filterable === "boolean" && value.filterable === false)) {
+                    if (value.filterable) {
                         result.push(key);
                     }
                     return result;
@@ -150,10 +150,11 @@ function SmartSearchController (
         const listName = $scope.list.name;
         const baseFieldPath = `models.${listName}.base.${rootField}`;
         const isBaseField = _.has($scope, `${baseFieldPath}`);
-        const filterable = _.get($scope, `${baseFieldPath}.filterable`);
-        const isNotFilterable = typeof filterable === "boolean" && filterable === false;
+
+        const isFilterable = _.get($scope, `${baseFieldPath}.filterable`);
         const isBaseModelRelatedSearchTermField = (_.get($scope, `${baseFieldPath}.type`) === 'field');
-        return isBaseField && !isBaseModelRelatedSearchTermField && !isNotFilterable;
+
+        return isBaseField && !isBaseModelRelatedSearchTermField && isFilterable;
     }
 
     function isRelatedField (termParts) {

From 6d7f772e98a2c8fdd31047014645877417f13bc7 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Fri, 4 May 2018 08:12:40 -0400
Subject: [PATCH 066/169] avoid DB action in signal, confusing logs

---
 awx/main/signals.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/awx/main/signals.py b/awx/main/signals.py
index a702fd2aaa..ea663eba39 100644
--- a/awx/main/signals.py
+++ b/awx/main/signals.py
@@ -205,7 +205,7 @@ def set_original_organization(sender, instance, **kwargs):
     pre-save organization, so we can later determine if the organization
     field is dirty.
     '''
-    instance.__original_org = instance.organization
+    instance.__original_org_id = instance.organization_id
 
 
 def save_related_job_templates(sender, instance, **kwargs):
@@ -217,7 +217,7 @@ def save_related_job_templates(sender, instance, **kwargs):
     if sender not in (Project, Inventory):
         raise ValueError('This signal callback is only intended for use with Project or Inventory')
 
-    if instance.__original_org != instance.organization:
+    if instance.__original_org_id != instance.organization_id:
         jtq = JobTemplate.objects.filter(**{sender.__name__.lower(): instance})
         for jt in jtq:
             update_role_parentage_for_instance(jt)

From c5d49be2c1baa38c175cd71827ab4cee89b53ac9 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Fri, 4 May 2018 08:39:09 -0400
Subject: [PATCH 067/169] avoid error in templating error

---
 awx/main/tests/unit/api/test_views.py  | 9 +++++++++
 awx/templates/rest_framework/base.html | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/awx/main/tests/unit/api/test_views.py b/awx/main/tests/unit/api/test_views.py
index 4c767043bb..fe1c4974dc 100644
--- a/awx/main/tests/unit/api/test_views.py
+++ b/awx/main/tests/unit/api/test_views.py
@@ -16,6 +16,9 @@ from awx.api.views import (
 from awx.main.models import (
     Host,
 )
+from awx.main.views import handle_error
+
+from rest_framework.test import APIRequestFactory
 
 
 @pytest.fixture
@@ -25,6 +28,12 @@ def mock_response_new(mocker):
     return m
 
 
+def test_handle_error():
+    # Assure that templating of error does not raise errors
+    request = APIRequestFactory().get('/fooooo/')
+    handle_error(request)
+
+
 class TestApiRootView:
     def test_get_endpoints(self, mocker, mock_response_new):
         endpoints = [
diff --git a/awx/templates/rest_framework/base.html b/awx/templates/rest_framework/base.html
index cbd761cf33..313bbec9a3 100644
--- a/awx/templates/rest_framework/base.html
+++ b/awx/templates/rest_framework/base.html
@@ -157,8 +157,8 @@
               </div>
 
               <div class="response-info" aria-label="{% trans "response info" %}">
-                <pre class="prettyprint"><span class="meta nocode"><b>HTTP {{ response.status_code }} {{ response.status_text }}</b>{% autoescape off %}{% for key, val in response_headers|items %}
-<b>{{ key }}:</b> <span class="lit">{{ val|break_long_headers|urlize_quoted_links }}</span>{% endfor %}
+                <pre class="prettyprint"><span class="meta nocode"><b>HTTP {{ response.status_code }} {{ response.status_text }}</b>{% autoescape off %}{% if response_headers %}{% for key, val in response_headers|items %}
+<b>{{ key }}:</b> <span class="lit">{{ val|break_long_headers|urlize_quoted_links }}</span>{% endfor %}{% endif %}
 {# Original line below had the side effect of also escaping content: #}
 {#   </span>{{ content|urlize_quoted_links }}</pre>{% endautoescape %}   #}
 {# For AWX, disable automatic URL creation and move content outside of autoescape off block. #}

From 3d752997eeb834c9af1cbadd30f865e21a2f0a72 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Fri, 4 May 2018 12:24:01 -0400
Subject: [PATCH 068/169] filter empty tags

---
 awx/ui/client/features/output/details.directive.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/features/output/details.directive.js b/awx/ui/client/features/output/details.directive.js
index 4808798ffe..f13de2821b 100644
--- a/awx/ui/client/features/output/details.directive.js
+++ b/awx/ui/client/features/output/details.directive.js
@@ -384,7 +384,7 @@ function getJobTagDetails () {
     const label = 'Job Tags';
     const more = false;
 
-    const value = jobTags.map($filter('sanitize'));
+    const value = jobTags.filter(tag => tag !== '').map($filter('sanitize'));
 
     return { label, more, value };
 }
@@ -406,8 +406,7 @@ function getSkipTagDetails () {
 
     const label = 'Skip Tags';
     const more = false;
-
-    const value = skipTags.map($filter('sanitize'));
+    const value = skipTags.filter(tag => tag !== '').map($filter('sanitize'));
 
     return { label, more, value };
 }

From a3fdd244b55de1aa744e2455cd63f487330e95bb Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Mon, 7 May 2018 00:48:55 -0400
Subject: [PATCH 069/169] add message service

---
 awx/ui/client/features/output/index.js        |  2 +
 .../client/features/output/message.service.js | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 awx/ui/client/features/output/message.service.js

diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js
index 0bb295a714..372d28221f 100644
--- a/awx/ui/client/features/output/index.js
+++ b/awx/ui/client/features/output/index.js
@@ -8,6 +8,7 @@ import RenderService from '~features/output/render.service';
 import ScrollService from '~features/output/scroll.service';
 import EngineService from '~features/output/engine.service';
 import StatusService from '~features/output/status.service';
+import MessageService from '~features/output/message.service';
 import LegacyRedirect from '~features/output/legacy.route';
 
 import DetailsDirective from '~features/output/details.directive';
@@ -221,6 +222,7 @@ angular
     .service('JobRenderService', RenderService)
     .service('JobEventEngine', EngineService)
     .service('JobStatusService', StatusService)
+    .service('JobMessageService', MessageService)
     .directive('atJobDetails', DetailsDirective)
     .directive('atJobSearch', SearchDirective)
     .directive('atJobStats', StatsDirective)
diff --git a/awx/ui/client/features/output/message.service.js b/awx/ui/client/features/output/message.service.js
new file mode 100644
index 0000000000..7e15ff302f
--- /dev/null
+++ b/awx/ui/client/features/output/message.service.js
@@ -0,0 +1,41 @@
+function MessageService () {
+    const listeners = {};
+    const registry = {};
+
+    this.subscribe = (key, listener) => {
+        registry[key] = registry[key] || 0;
+
+        listeners[key] = listeners[key] || {};
+        listeners[key][registry[key]] = listener;
+
+        const unsubscribe = this.createCallback(key, registry[key]);
+
+        registry[key]++;
+
+        return unsubscribe;
+    };
+
+    this.dispatch = (key, data) => {
+        if (!listeners[key]) {
+            return;
+        }
+
+        const indices = Object.keys(listeners[key]);
+
+        for (let i = 0; i < indices.length; i++) {
+            listeners[key][indices[i]](data);
+        }
+    };
+
+    this.createCallback = (key, index) => {
+        const callback = () => {
+            if (listeners[key]) {
+                delete listeners[key][index];
+            }
+        };
+
+        return callback;
+    };
+}
+
+export default MessageService;

From 58beb9640c92d0f77e4f0f77f8eeba0bc5890b10 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Mon, 7 May 2018 01:00:48 -0400
Subject: [PATCH 070/169] remove watchers

---
 .../features/output/details.directive.js      |  25 +--
 .../features/output/search.directive.js       |  12 +-
 .../client/features/output/stats.directive.js |  26 ++-
 .../client/features/output/status.service.js  | 162 ++++++++++--------
 4 files changed, 119 insertions(+), 106 deletions(-)

diff --git a/awx/ui/client/features/output/details.directive.js b/awx/ui/client/features/output/details.directive.js
index f13de2821b..510173d9ad 100644
--- a/awx/ui/client/features/output/details.directive.js
+++ b/awx/ui/client/features/output/details.directive.js
@@ -10,7 +10,6 @@ let parse;
 let prompt;
 let resource;
 let strings;
-let status;
 let wait;
 
 let vm;
@@ -553,9 +552,9 @@ function AtJobDetailsController (
     _error_,
     _prompt_,
     _strings_,
-    _status_,
     _wait_,
     _parse_,
+    { subscribe }
 ) {
     vm = this || {};
 
@@ -567,7 +566,6 @@ function AtJobDetailsController (
     parse = _parse_;
     prompt = _prompt_;
     strings = _strings_;
-    status = _status_;
     wait = _wait_;
 
     vm.init = _$scope_ => {
@@ -610,18 +608,13 @@ function AtJobDetailsController (
         vm.toggleJobTags = toggleJobTags;
         vm.toggleSkipTags = toggleSkipTags;
 
-        const observe = (getter, transform, key) => {
-            $scope.$watch(getter, value => { vm[key] = transform(value); });
-        };
-
-        observe(status.getStarted, getStartDetails, 'started');
-        observe(status.getFinished, getFinishDetails, 'finished');
-        observe(status.getProjectUpdateId, getProjectUpdateDetails, 'projectUpdate');
-        observe(status.getProjectStatus, getProjectStatusDetails, 'projectStatus');
-
-        $scope.$watch(status.getJobStatus, jobStatus => {
-            vm.status = getStatusDetails(jobStatus);
-            vm.job.status = jobStatus;
+        subscribe(({ status, started, finished, scm }) => {
+            vm.job.status = status;
+            vm.status = getStatusDetails(status);
+            vm.started = getStartDetails(started);
+            vm.finished = getFinishDetails(finished);
+            vm.projectUpdate = getProjectUpdateDetails(scm.id);
+            vm.projectStatus = getProjectStatusDetails(scm.status);
         });
     };
 }
@@ -633,9 +626,9 @@ AtJobDetailsController.$inject = [
     'ProcessErrors',
     'Prompt',
     'JobStrings',
-    'JobStatusService',
     'Wait',
     'ParseVariableString',
+    'JobStatusService',
 ];
 
 function atJobDetailsLink (scope, el, attrs, controllers) {
diff --git a/awx/ui/client/features/output/search.directive.js b/awx/ui/client/features/output/search.directive.js
index 0a688f92bb..6259013200 100644
--- a/awx/ui/client/features/output/search.directive.js
+++ b/awx/ui/client/features/output/search.directive.js
@@ -8,7 +8,6 @@ const PLACEHOLDER_RUNNING = 'CANNOT SEARCH RUNNING JOB';
 const PLACEHOLDER_DEFAULT = 'SEARCH';
 
 let $state;
-let status;
 let qs;
 
 let vm;
@@ -71,9 +70,8 @@ function atJobSearchLink (scope, el, attrs, controllers) {
     atJobSearchController.init(scope);
 }
 
-function AtJobSearchController (_$state_, _status_, _qs_) {
+function AtJobSearchController (_$state_, _qs_, { subscribe }) {
     $state = _$state_;
-    status = _status_;
     qs = _qs_;
 
     vm = this || {};
@@ -97,17 +95,17 @@ function AtJobSearchController (_$state_, _status_, _qs_) {
         vm.placeholder = PLACEHOLDER_DEFAULT;
         vm.relatedFields = scope.relatedFields || [];
 
-        scope.$watch(status.isRunning, value => {
-            vm.disabled = value;
-            vm.placeholder = value ? PLACEHOLDER_RUNNING : PLACEHOLDER_DEFAULT;
+        subscribe(({ running }) => {
+            vm.disabled = running;
+            vm.placeholder = running ? PLACEHOLDER_RUNNING : PLACEHOLDER_DEFAULT;
         });
     };
 }
 
 AtJobSearchController.$inject = [
     '$state',
-    'JobStatusService',
     'QuerySet',
+    'JobStatusService',
 ];
 
 function atJobSearch () {
diff --git a/awx/ui/client/features/output/stats.directive.js b/awx/ui/client/features/output/stats.directive.js
index 789fc29de6..182ab27479 100644
--- a/awx/ui/client/features/output/stats.directive.js
+++ b/awx/ui/client/features/output/stats.directive.js
@@ -1,6 +1,5 @@
 const templateUrl = require('~features/output/stats.partial.html');
 
-let status;
 let strings;
 
 function createStatsBarTooltip (key, count) {
@@ -16,8 +15,7 @@ function atJobStatsLink (scope, el, attrs, controllers) {
     atJobStatsController.init(scope);
 }
 
-function AtJobStatsController (_strings_, _status_) {
-    status = _status_;
+function AtJobStatsController (_strings_, { subscribe }) {
     strings = _strings_;
 
     const vm = this || {};
@@ -36,18 +34,17 @@ function AtJobStatsController (_strings_, _status_) {
 
         vm.toggleStdoutFullscreenTooltip = strings.get('expandCollapse.EXPAND');
 
-        vm.setHostStatusCounts(status.getHostStatusCounts());
-
-        scope.$watch(status.getPlayCount, value => { vm.plays = value; });
-        scope.$watch(status.getTaskCount, value => { vm.tasks = value; });
-        scope.$watch(status.getElapsed, value => { vm.elapsed = value; });
-        scope.$watch(status.getHostCount, value => { vm.hosts = value; });
-        scope.$watch(status.isRunning, value => { vm.running = value; });
-
-        scope.$watchCollection(status.getHostStatusCounts, vm.setHostStatusCounts);
+        subscribe(({ running, elapsed, counts, stats, hosts }) => {
+            vm.plays = counts.plays;
+            vm.tasks = counts.tasks;
+            vm.hosts = counts.hosts;
+            vm.elapsed = elapsed;
+            vm.running = running;
+            vm.setHostStatusCounts(stats, hosts);
+        });
     };
 
-    vm.setHostStatusCounts = counts => {
+    vm.setHostStatusCounts = (stats, counts) => {
         Object.keys(counts).forEach(key => {
             const count = counts[key];
             const statusBarElement = $(`.HostStatusBar-${key}`);
@@ -57,7 +54,7 @@ function AtJobStatsController (_strings_, _status_) {
             vm.tooltips[key] = createStatsBarTooltip(key, count);
         });
 
-        vm.statsAreAvailable = Boolean(status.getStatsEvent());
+        vm.statsAreAvailable = stats;
     };
 
     vm.toggleFullscreen = () => {
@@ -78,7 +75,6 @@ function atJobStats () {
         controller: [
             'JobStrings',
             'JobStatusService',
-            '$scope',
             AtJobStatsController
         ],
         scope: {
diff --git a/awx/ui/client/features/output/status.service.js b/awx/ui/client/features/output/status.service.js
index 638d2ff399..12e3fd2544 100644
--- a/awx/ui/client/features/output/status.service.js
+++ b/awx/ui/client/features/output/status.service.js
@@ -6,34 +6,46 @@ const TASK_START = 'playbook_on_task_start';
 const HOST_STATUS_KEYS = ['dark', 'failures', 'changed', 'ok', 'skipped'];
 const FINISHED = ['successful', 'failed', 'error'];
 
-let moment;
-
-function JobStatusService (_moment_) {
-    moment = _moment_;
+function JobStatusService (moment, message) {
+    this.dispatch = () => message.dispatch('status', this.state);
+    this.subscribe = listener => message.subscribe('status', listener);
 
     this.init = ({ resource }) => {
+        const { model } = resource;
+
+        this.created = model.get('created');
+        this.job = model.get('id');
+        this.jobType = model.get('type');
+        this.project = model.get('project');
+
+        this.active = false;
+        this.latestTime = null;
         this.counter = -1;
 
-        this.created = resource.model.get('created');
-        this.job = resource.model.get('id');
-        this.jobType = resource.model.get('type');
-        this.project = resource.model.get('project');
-        this.elapsed = resource.model.get('elapsed');
-        this.started = resource.model.get('started');
-        this.finished = resource.model.get('finished');
-        this.jobStatus = resource.model.get('status');
-        this.projectStatus = resource.model.get('summary_fields.project_update.status');
-        this.projectUpdateId = resource.model.get('summary_fields.project_update.id');
+        this.state = {
+            running: false,
+            stats: false,
+            counts: {
+                plays: null,
+                tasks: null,
+                hosts: null,
+            },
+            hosts: {},
+            status: model.get('status'),
+            elapsed: model.get('elapsed'),
+            started: model.get('started'),
+            finished: model.get('finished'),
+            scm: {
+                id: model.get('summary_fields.project_update.id'),
+                status: model.get('summary_fields.project_update.status')
+            },
+        };
 
-        this.latestTime = null;
-        this.playCount = null;
-        this.taskCount = null;
-        this.hostCount = null;
-        this.active = false;
-        this.hostStatusCounts = {};
-
-        this.statsEvent = resource.stats;
+        this.setStatsEvent(resource.stats);
         this.updateStats();
+        this.updateRunningState();
+
+        this.dispatch();
     };
 
     this.pushStatusEvent = data => {
@@ -59,24 +71,46 @@ function JobStatusService (_moment_) {
         if (isLatest) {
             this.counter = data.counter;
             this.latestTime = data.created;
-            this.elapsed = moment(data.created).diff(this.created, 'seconds');
+            this.setElapsed(moment(data.created).diff(this.created, 'seconds'));
         }
 
         if (data.event === JOB_START) {
-            this.started = this.started || data.created;
+            this.setStarted(this.state.started || data.created);
         }
 
         if (data.event === PLAY_START) {
-            this.playCount++;
+            this.state.counts.plays++;
         }
 
         if (data.event === TASK_START) {
-            this.taskCount++;
+            this.state.counts.tasks++;
         }
 
         if (data.event === JOB_END) {
-            this.statsEvent = data;
+            this.setStatsEvent(data);
         }
+
+        this.dispatch();
+    };
+
+    this.isExpectingStatsEvent = () => (this.jobType === 'job') ||
+        (this.jobType === 'project_update');
+
+    this.updateStats = () => {
+        this.updateHostCounts();
+
+        if (this.statsEvent) {
+            this.state.stats = true;
+            this.setFinished(this.statsEvent.created);
+            this.setJobStatus(this.statsEvent.failed ? 'failed' : 'successful');
+        }
+    };
+
+    this.updateRunningState = () => {
+        this.state.running = (Boolean(this.state.started) && !this.state.finished) ||
+            (this.state.status === 'running') ||
+            (this.state.status === 'pending') ||
+            (this.state.status === 'waiting');
     };
 
     this.updateHostCounts = () => {
@@ -98,74 +132,66 @@ function JobStatusService (_moment_) {
             });
         });
 
-        this.hostCount = countedHostNames.length;
-        this.hostStatusCounts = counts;
+        this.state.counts.hosts = countedHostNames.length;
+        this.setHostStatusCounts(counts);
     };
 
-    this.updateStats = () => {
-        this.updateHostCounts();
-
-        if (this.statsEvent) {
-            this.setFinished(this.statsEvent.created);
-            this.setJobStatus(this.statsEvent.failed ? 'failed' : 'successful');
-        }
-    };
-
-    this.isRunning = () => (Boolean(this.started) && !this.finished) ||
-        (this.jobStatus === 'running') ||
-        (this.jobStatus === 'pending') ||
-        (this.jobStatus === 'waiting');
-
-    this.isExpectingStatsEvent = () => (this.jobType === 'job') ||
-        (this.jobType === 'project_update');
-
-    this.getPlayCount = () => this.playCount;
-    this.getTaskCount = () => this.taskCount;
-    this.getHostCount = () => this.hostCount;
-    this.getHostStatusCounts = () => this.hostStatusCounts || {};
-    this.getJobStatus = () => this.jobStatus;
-    this.getProjectStatus = () => this.projectStatus;
-    this.getProjectUpdateId = () => this.projectUpdateId;
-    this.getElapsed = () => this.elapsed;
-    this.getStatsEvent = () => this.statsEvent;
-    this.getStarted = () => this.started;
-    this.getFinished = () => this.finished;
-
     this.setJobStatus = status => {
-        this.jobStatus = status;
+        this.state.status = status;
 
         if (!this.isExpectingStatsEvent() && _.includes(FINISHED, status)) {
             if (this.latestTime) {
                 this.setFinished(this.latestTime);
-
-                if (!this.started && this.elapsed) {
-                    this.started = moment(this.latestTime).subtract(this.elapsed, 'seconds');
+                if (!this.state.started && this.state.elapsed) {
+                    this.setStarted(moment(this.latestTime)
+                        .subtract(this.state.elapsed, 'seconds'));
                 }
             }
         }
+
+        this.updateRunningState();
+    };
+
+    this.setElapsed = elapsed => {
+        this.state.elapsed = elapsed;
+    };
+
+    this.setStarted = started => {
+        this.state.started = started;
+        this.updateRunningState();
     };
 
     this.setProjectStatus = status => {
-        this.projectStatus = status;
+        this.state.scm.status = status;
     };
 
     this.setProjectUpdateId = id => {
-        this.projectUpdateId = id;
+        this.state.scm.id = id;
     };
 
     this.setFinished = time => {
-        this.finished = time;
+        this.state.finished = time;
+        this.updateRunningState();
+    };
+
+    this.setStatsEvent = data => {
+        this.statsEvent = data;
+    };
+
+    this.setHostStatusCounts = counts => {
+        this.state.hosts = counts;
     };
 
     this.resetCounts = () => {
-        this.playCount = 0;
-        this.taskCount = 0;
-        this.hostCount = 0;
+        this.state.counts.plays = 0;
+        this.state.counts.tasks = 0;
+        this.state.counts.hosts = 0;
     };
 }
 
 JobStatusService.$inject = [
     'moment',
+    'JobMessageService',
 ];
 
 export default JobStatusService;

From 42b88c640083b935c948d4b188e459bddf04c723 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Mon, 7 May 2018 01:07:28 -0400
Subject: [PATCH 071/169] move directive code to components

---
 ...ails.directive.js => details.component.js} | 65 ++++++++----------
 .../features/output/index.controller.js       | 18 ++---
 awx/ui/client/features/output/index.js        | 14 ++--
 awx/ui/client/features/output/index.view.html | 14 ++--
 ...earch.directive.js => search.component.js} | 50 ++++++--------
 ...{stats.directive.js => stats.component.js} | 67 ++++++++-----------
 .../client/features/output/stats.partial.html |  4 +-
 7 files changed, 99 insertions(+), 133 deletions(-)
 rename awx/ui/client/features/output/{details.directive.js => details.component.js} (93%)
 rename awx/ui/client/features/output/{search.directive.js => search.component.js} (76%)
 rename awx/ui/client/features/output/{stats.directive.js => stats.component.js} (54%)

diff --git a/awx/ui/client/features/output/details.directive.js b/awx/ui/client/features/output/details.component.js
similarity index 93%
rename from awx/ui/client/features/output/details.directive.js
rename to awx/ui/client/features/output/details.component.js
index 510173d9ad..d74cea977a 100644
--- a/awx/ui/client/features/output/details.directive.js
+++ b/awx/ui/client/features/output/details.component.js
@@ -2,7 +2,6 @@ const templateUrl = require('~features/output/details.partial.html');
 
 let $http;
 let $filter;
-let $scope;
 let $state;
 
 let error;
@@ -371,7 +370,7 @@ function getJobTagDetails () {
     let jobTags;
 
     if (tagString) {
-        jobTags = tagString.split(',');
+        jobTags = tagString.split(',').filter(tag => tag !== '');
     } else {
         jobTags = [];
     }
@@ -383,7 +382,7 @@ function getJobTagDetails () {
     const label = 'Job Tags';
     const more = false;
 
-    const value = jobTags.filter(tag => tag !== '').map($filter('sanitize'));
+    const value = jobTags.map($filter('sanitize'));
 
     return { label, more, value };
 }
@@ -394,7 +393,7 @@ function getSkipTagDetails () {
     let skipTags;
 
     if (tagString) {
-        skipTags = tagString.split(',');
+        skipTags = tagString.split(',').filter(tag => tag !== '');
     } else {
         skipTags = [];
     }
@@ -405,7 +404,7 @@ function getSkipTagDetails () {
 
     const label = 'Skip Tags';
     const more = false;
-    const value = skipTags.filter(tag => tag !== '').map($filter('sanitize'));
+    const value = skipTags.map($filter('sanitize'));
 
     return { label, more, value };
 }
@@ -445,7 +444,7 @@ function createErrorHandler (path, action) {
         const hdr = strings.get('error.HEADER');
         const msg = strings.get('error.CALL', { path, action, status: res.status });
 
-        error($scope, res.data, res.status, null, { hdr, msg });
+        error(null, res.data, res.status, null, { hdr, msg });
     };
 }
 
@@ -545,7 +544,7 @@ function deleteJob () {
     prompt({ hdr, resourceName, body, actionText, action });
 }
 
-function AtJobDetailsController (
+function JobDetailsController (
     _$http_,
     _$filter_,
     _$state_,
@@ -554,23 +553,24 @@ function AtJobDetailsController (
     _strings_,
     _wait_,
     _parse_,
-    { subscribe }
+    { subscribe },
 ) {
     vm = this || {};
 
     $http = _$http_;
     $filter = _$filter_;
     $state = _$state_;
-
     error = _error_;
+
     parse = _parse_;
     prompt = _prompt_;
     strings = _strings_;
     wait = _wait_;
 
-    vm.init = _$scope_ => {
-        $scope = _$scope_;
-        resource = $scope.resource; // eslint-disable-line prefer-destructuring
+    let unsubscribe;
+
+    vm.$onInit = () => {
+        resource = this.resource; // eslint-disable-line prefer-destructuring
 
         vm.status = getStatusDetails();
         vm.started = getStartDetails();
@@ -604,22 +604,26 @@ function AtJobDetailsController (
 
         vm.cancelJob = cancelJob;
         vm.deleteJob = deleteJob;
-        vm.toggleLabels = toggleLabels;
         vm.toggleJobTags = toggleJobTags;
         vm.toggleSkipTags = toggleSkipTags;
+        vm.toggleLabels = toggleLabels;
 
-        subscribe(({ status, started, finished, scm }) => {
-            vm.job.status = status;
-            vm.status = getStatusDetails(status);
+        unsubscribe = subscribe(({ status, started, finished, scm }) => {
             vm.started = getStartDetails(started);
             vm.finished = getFinishDetails(finished);
             vm.projectUpdate = getProjectUpdateDetails(scm.id);
             vm.projectStatus = getProjectStatusDetails(scm.status);
+            vm.status = getStatusDetails(status);
+            vm.job.status = status;
         });
     };
+
+    vm.$onDestroy = () => {
+        unsubscribe();
+    };
 }
 
-AtJobDetailsController.$inject = [
+JobDetailsController.$inject = [
     '$http',
     '$filter',
     '$state',
@@ -631,22 +635,11 @@ AtJobDetailsController.$inject = [
     'JobStatusService',
 ];
 
-function atJobDetailsLink (scope, el, attrs, controllers) {
-    const [atDetailsController] = controllers;
-
-    atDetailsController.init(scope);
-}
-
-function atJobDetails () {
-    return {
-        templateUrl,
-        restrict: 'E',
-        require: ['atJobDetails'],
-        controllerAs: 'vm',
-        link: atJobDetailsLink,
-        controller: AtJobDetailsController,
-        scope: { resource: '=', },
-    };
-}
-
-export default atJobDetails;
+export default {
+    templateUrl,
+    controller: JobDetailsController,
+    controllerAs: 'vm',
+    bindings: {
+        resource: '<'
+    },
+};
diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js
index 488d994dc2..e84c93d708 100644
--- a/awx/ui/client/features/output/index.controller.js
+++ b/awx/ui/client/features/output/index.controller.js
@@ -38,9 +38,8 @@ function JobsIndexController (
     vm.clear = devClear;
 
     // Expand/collapse
-    // vm.toggle = toggle;
-    // vm.expand = expand;
-    vm.isExpanded = true;
+    vm.expanded = false;
+    vm.toggleExpanded = toggleExpanded;
 
     // Panel
     vm.resource = resource;
@@ -55,10 +54,6 @@ function JobsIndexController (
         up: scrollPageUp
     };
 
-    vm.fullscreen = {
-        isFullscreen: false
-    };
-
     render.requestAnimationFrame(() => init());
 }
 
@@ -96,13 +91,14 @@ function init () {
         },
         onStop () {
             status.updateStats();
+            status.dispatch();
         }
     });
 
     $scope.$on(resource.ws.events, handleJobEvent);
     $scope.$on(resource.ws.status, handleStatusEvent);
 
-    if (!status.isRunning()) {
+    if (!status.state.running) {
         next();
     }
 }
@@ -281,9 +277,9 @@ function scrollIsAtRest (isAtRest) {
     vm.scroll.showBackToTop = !isAtRest;
 }
 
-// function expand () {
-//     vm.toggle(parent, true);
-// }
+function toggleExpanded () {
+    vm.expanded = !vm.expanded;
+}
 
 // function showHostDetails (id) {
 //     jobEvent.request('get', id)
diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js
index 372d28221f..6b14296553 100644
--- a/awx/ui/client/features/output/index.js
+++ b/awx/ui/client/features/output/index.js
@@ -11,9 +11,9 @@ import StatusService from '~features/output/status.service';
 import MessageService from '~features/output/message.service';
 import LegacyRedirect from '~features/output/legacy.route';
 
-import DetailsDirective from '~features/output/details.directive';
-import SearchDirective from '~features/output/search.directive';
-import StatsDirective from '~features/output/stats.directive';
+import DetailsComponent from '~features/output/details.component';
+import SearchComponent from '~features/output/search.component';
+import StatsComponent from '~features/output/stats.component';
 import HostEvent from './host-event/index';
 
 const Template = require('~features/output/index.view.html');
@@ -176,7 +176,7 @@ function JobsRun ($stateRegistry, strings) {
                 templateUrl: Template,
                 controller: Controller,
                 controllerAs: 'vm'
-            }
+            },
         },
         resolve: {
             webSocketConnection: [
@@ -223,9 +223,9 @@ angular
     .service('JobEventEngine', EngineService)
     .service('JobStatusService', StatusService)
     .service('JobMessageService', MessageService)
-    .directive('atJobDetails', DetailsDirective)
-    .directive('atJobSearch', SearchDirective)
-    .directive('atJobStats', StatsDirective)
+    .component('atJobSearch', SearchComponent)
+    .component('atJobStats', StatsComponent)
+    .component('atJobDetails', DetailsComponent)
     .run(JobsRun)
     .run(LegacyRedirect);
 
diff --git a/awx/ui/client/features/output/index.view.html b/awx/ui/client/features/output/index.view.html
index f25171f9f2..cb932fafd3 100644
--- a/awx/ui/client/features/output/index.view.html
+++ b/awx/ui/client/features/output/index.view.html
@@ -1,23 +1,25 @@
 <div ui-view></div>
 <div class="JobResults-container">
-    <at-panel ng-show="!vm.fullscreen.isFullscreen">
-        <at-job-details resource="vm.resource"></at-job-details>
+    <at-panel ng-show="!vm.expanded">
+        <at-job-details 
+            resource="vm.resource">
+        </at-job-details>
     </at-panel>
 
-    <at-panel class="at-Stdout" ng-class="{'at-Stdout--fullscreen': vm.fullscreen.isFullscreen}">
+    <at-panel class="at-Stdout" ng-class="{'at-Stdout--fullscreen': vm.expanded}">
         <div class="at-Panel-headingTitle">
             {{ vm.title }}
         </div>
         <at-job-stats
             resource="vm.resource"
-            fullscreen="vm.fullscreen">
+            expanded="vm.expanded">
         </at-job-stats>
         <at-job-search></at-job-search>
 
         <div class="at-Stdout-menuTop">
-            <div class="pull-left" ng-click="vm.expand()">
+            <div class="pull-left" ng-click="vm.toggleExpand()">
                 <i class="at-Stdout-menuIcon fa"
-                    ng-class="{ 'fa-minus': vm.isExpanded, 'fa-plus': !vm.isExpanded }"></i>
+                    ng-class="{ 'fa-minus': vm.expanded, 'fa-plus': !vm.expanded }"></i>
             </div>
 
             <div class="pull-right" ng-click="vm.scroll.end()">
diff --git a/awx/ui/client/features/output/search.directive.js b/awx/ui/client/features/output/search.component.js
similarity index 76%
rename from awx/ui/client/features/output/search.directive.js
rename to awx/ui/client/features/output/search.component.js
index 6259013200..d1e37edd14 100644
--- a/awx/ui/client/features/output/search.directive.js
+++ b/awx/ui/client/features/output/search.component.js
@@ -64,13 +64,7 @@ function clearSearch () {
     $state.transitionTo($state.current, $state.params, searchReloadOptions);
 }
 
-function atJobSearchLink (scope, el, attrs, controllers) {
-    const [atJobSearchController] = controllers;
-
-    atJobSearchController.init(scope);
-}
-
-function AtJobSearchController (_$state_, _qs_, { subscribe }) {
+function JobSearchController (_$state_, _qs_, { subscribe }) {
     $state = _$state_;
     qs = _qs_;
 
@@ -89,39 +83,33 @@ function AtJobSearchController (_$state_, _qs_, { subscribe }) {
     vm.removeSearchTag = removeSearchTag;
     vm.submitSearch = submitSearch;
 
-    vm.init = scope => {
-        vm.examples = scope.examples || searchKeyExamples;
-        vm.fields = scope.fields || searchKeyFields;
-        vm.placeholder = PLACEHOLDER_DEFAULT;
-        vm.relatedFields = scope.relatedFields || [];
+    let unsubscribe;
 
-        subscribe(({ running }) => {
+    vm.$onInit = () => {
+        vm.examples = searchKeyExamples;
+        vm.fields = searchKeyFields;
+        vm.placeholder = PLACEHOLDER_DEFAULT;
+        vm.relatedFields = [];
+
+        unsubscribe = subscribe(({ running }) => {
             vm.disabled = running;
             vm.placeholder = running ? PLACEHOLDER_RUNNING : PLACEHOLDER_DEFAULT;
         });
     };
+
+    vm.$onDestroy = () => {
+        unsubscribe();
+    };
 }
 
-AtJobSearchController.$inject = [
+JobSearchController.$inject = [
     '$state',
     'QuerySet',
     'JobStatusService',
 ];
 
-function atJobSearch () {
-    return {
-        templateUrl,
-        restrict: 'E',
-        require: ['atJobSearch'],
-        controllerAs: 'vm',
-        link: atJobSearchLink,
-        controller: AtJobSearchController,
-        scope: {
-            examples: '=',
-            fields: '=',
-            relatedFields: '=',
-        },
-    };
-}
-
-export default atJobSearch;
+export default {
+    templateUrl,
+    controller: JobSearchController,
+    controllerAs: 'vm',
+};
diff --git a/awx/ui/client/features/output/stats.directive.js b/awx/ui/client/features/output/stats.component.js
similarity index 54%
rename from awx/ui/client/features/output/stats.directive.js
rename to awx/ui/client/features/output/stats.component.js
index 182ab27479..a7a0ec61f3 100644
--- a/awx/ui/client/features/output/stats.directive.js
+++ b/awx/ui/client/features/output/stats.component.js
@@ -1,6 +1,6 @@
 const templateUrl = require('~features/output/stats.partial.html');
 
-let strings;
+let vm;
 
 function createStatsBarTooltip (key, count) {
     const label = `<span class='HostStatusBar-tooltipLabel'>${key}</span>`;
@@ -9,32 +9,21 @@ function createStatsBarTooltip (key, count) {
     return `${label}${badge}`;
 }
 
-function atJobStatsLink (scope, el, attrs, controllers) {
-    const [atJobStatsController] = controllers;
+function JobStatsController (strings, { subscribe }) {
+    vm = this || {};
 
-    atJobStatsController.init(scope);
-}
-
-function AtJobStatsController (_strings_, { subscribe }) {
-    strings = _strings_;
-
-    const vm = this || {};
+    let unsubscribe;
 
     vm.tooltips = {
         running: strings.get('status.RUNNING'),
         unavailable: strings.get('status.UNAVAILABLE'),
     };
 
-    vm.init = scope => {
-        const { resource } = scope;
-
-        vm.fullscreen = scope.fullscreen;
-
-        vm.download = resource.model.get('related.stdout');
-
+    vm.$onInit = () => {
+        vm.download = vm.resource.model.get('related.stdout');
         vm.toggleStdoutFullscreenTooltip = strings.get('expandCollapse.EXPAND');
 
-        subscribe(({ running, elapsed, counts, stats, hosts }) => {
+        unsubscribe = subscribe(({ running, elapsed, counts, stats, hosts }) => {
             vm.plays = counts.plays;
             vm.tasks = counts.tasks;
             vm.hosts = counts.hosts;
@@ -44,6 +33,10 @@ function AtJobStatsController (_strings_, { subscribe }) {
         });
     };
 
+    vm.$onDestroy = () => {
+        unsubscribe();
+    };
+
     vm.setHostStatusCounts = (stats, counts) => {
         Object.keys(counts).forEach(key => {
             const count = counts[key];
@@ -57,31 +50,25 @@ function AtJobStatsController (_strings_, { subscribe }) {
         vm.statsAreAvailable = stats;
     };
 
-    vm.toggleFullscreen = () => {
-        vm.fullscreen.isFullscreen = !vm.fullscreen.isFullscreen;
-        vm.toggleStdoutFullscreenTooltip = vm.fullscreen.isFullscreen ?
+    vm.toggleExpanded = () => {
+        vm.expanded = !vm.expanded;
+        vm.toggleStdoutFullscreenTooltip = vm.expanded ?
             strings.get('expandCollapse.COLLAPSE') :
             strings.get('expandCollapse.EXPAND');
     };
 }
 
-function atJobStats () {
-    return {
-        templateUrl,
-        restrict: 'E',
-        require: ['atJobStats'],
-        controllerAs: 'vm',
-        link: atJobStatsLink,
-        controller: [
-            'JobStrings',
-            'JobStatusService',
-            AtJobStatsController
-        ],
-        scope: {
-            resource: '=',
-            fullscreen: '='
-        }
-    };
-}
+JobStatsController.$inject = [
+    'JobStrings',
+    'JobStatusService',
+];
 
-export default atJobStats;
+export default {
+    templateUrl,
+    controller: JobStatsController,
+    controllerAs: 'vm',
+    bindings: {
+        resource: '<',
+        expanded: '=',
+    },
+};
diff --git a/awx/ui/client/features/output/stats.partial.html b/awx/ui/client/features/output/stats.partial.html
index 6427735236..c55ba4bc8d 100644
--- a/awx/ui/client/features/output/stats.partial.html
+++ b/awx/ui/client/features/output/stats.partial.html
@@ -31,8 +31,8 @@
         aw-tool-tip="{{ vm.toggleStdoutFullscreenTooltip }}"
         data-tip-watch="vm.toggleStdoutFullscreenTooltip"
         data-placement="top"
-        ng-class="{'at-Input-button--active': vm.fullscreen.isFullscreen}"
-        ng-click="vm.toggleFullscreen()">
+        ng-class="{'at-Input-button--active': vm.expanded}"
+        ng-click="vm.toggleExpanded()">
         <i class="fa fa-arrows-alt"></i>
     </button>
 </div>

From d00b8549b4a7b789f176aeea3779079facbc24f1 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Mon, 7 May 2018 07:22:03 -0400
Subject: [PATCH 072/169] disable activity stream for relaunched job label
 associations

---
 awx/main/models/unified_jobs.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py
index 943956f7ac..f758a230a9 100644
--- a/awx/main/models/unified_jobs.py
+++ b/awx/main/models/unified_jobs.py
@@ -838,8 +838,11 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
                 setattr(unified_job, fd, val)
             unified_job.save()
 
-        # Labels coppied here
-        copy_m2m_relationships(self, unified_job, fields)
+        # Labels copied here
+        from awx.main.signals import disable_activity_stream
+        with disable_activity_stream():
+            copy_m2m_relationships(self, unified_job, fields)
+
         return unified_job
 
     def launch_prompts(self):

From 363266fb89c9ea4b43a92268b3c116ea85dacdc6 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Mon, 7 May 2018 07:22:16 -0400
Subject: [PATCH 073/169] fix links to workflow jobs on activity stream

---
 .../src/activity-stream/factories/build-anchor.factory.js      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
index 1fc031e0e6..ae03ae7e11 100644
--- a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
+++ b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
@@ -62,6 +62,9 @@ export default function BuildAnchor($log, $filter) {
                  case 'workflow_job_template':
                      url += `templates/workflow_job_template/${obj.id}`;
                      break;
+                 case 'workflow_job':
+                     url += `workflows/${obj.id}`;
+                     break;
                  default:
                      url += resource + 's/' + obj.id + '/';
              }

From 63c268f9c52763bc5553cc281c0695ff95b97b18 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Mon, 7 May 2018 07:22:25 -0400
Subject: [PATCH 074/169] don't render activity stream links for labels

---
 .../factories/build-anchor.factory.js                | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
index ae03ae7e11..97da2ba5e3 100644
--- a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
+++ b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
@@ -65,10 +65,20 @@ export default function BuildAnchor($log, $filter) {
                  case 'workflow_job':
                      url += `workflows/${obj.id}`;
                      break;
+                 case 'label':
+                     url = null;
+                     break;
                  default:
                      url += resource + 's/' + obj.id + '/';
              }
-             return ' <a href=\"' + url + '\"> ' + $filter('sanitize')(obj.name || obj.username) + ' </a> ';
+
+             const name = $filter('sanitize')(obj.name || obj.username);
+
+             if (url) {
+                return ` <a href=\"${url}\"> ${name} </a> `;
+             }
+
+             return ` <span> ${name} </span> `;
          }
          catch(err){
              $log.debug(err);

From 5a37184e7c834e5db5d5bbb5bd198742263812ef Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Mon, 7 May 2018 07:44:08 -0400
Subject: [PATCH 075/169] add log message when locks are holding up jobs

---
 awx/main/tasks.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 00252ebdaf..b502a4240b 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -1666,7 +1666,13 @@ class RunProjectUpdate(BaseTask):
             raise
 
         try:
+            start_time = time.time()
             fcntl.flock(self.lock_fd, fcntl.LOCK_EX)
+            waiting_time = time.time() - start_time
+            if waiting_time > 1.0:
+                logger.info(six.text_type(
+                    '{} spent {} waiting to acquire lock for local source tree '
+                    'for path {}.').format(instance.log_format, waiting_time, lock_path))
         except IOError as e:
             os.close(self.lock_fd)
             logger.error(six.text_type("I/O error({0}) while trying to aquire lock on file [{1}]: {2}").format(e.errno, lock_path, e.strerror))

From b275d13da22cf75009adc72ca309564c231a0dee Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Mon, 7 May 2018 08:38:44 -0400
Subject: [PATCH 076/169] fix error-handling bug for tower inventory source

---
 awx/plugins/inventory/tower.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/awx/plugins/inventory/tower.py b/awx/plugins/inventory/tower.py
index 52a63a0bab..ff14f6b731 100755
--- a/awx/plugins/inventory/tower.py
+++ b/awx/plugins/inventory/tower.py
@@ -90,6 +90,7 @@ def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, license_
         tower_host = "https://{}".format(tower_host)
     inventory_url = urljoin(tower_host, "/api/v2/inventories/{}/script/?hostvars=1&towervars=1&all=1".format(inventory.replace('/', '')))
     config_url = urljoin(tower_host, "/api/v2/config/")
+    reason = None
     try:
         if license_type != "open":
             config_response = requests.get(config_url,
@@ -106,14 +107,16 @@ def read_tower_inventory(tower_host, tower_user, tower_pass, inventory, license_
         response = requests.get(inventory_url,
                                 auth=HTTPBasicAuth(tower_user, tower_pass),
                                 verify=not ignore_ssl)
+        try:
+            json_response = response.json()
+        except (ValueError, TypeError) as e:
+            reason = "Failed to parse json from host: {}".format(e)
         if response.ok:
-            return response.json()
-        json_reason = response.json()
-        reason = json_reason.get('detail', 'Retrieving Tower Inventory Failed')
+            return json_response
+        if not reason:
+            reason = json_response.get('detail', 'Retrieving Tower Inventory Failed')
     except requests.ConnectionError as e:
         reason = "Connection to remote host failed: {}".format(e)
-    except json.JSONDecodeError as e:
-        reason = "Failed to parse json from host: {}".format(e)
     raise RuntimeError(reason)
 
 

From e099c455d21e18979f2015c1fc0c0c13a1322034 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Mon, 7 May 2018 08:56:24 -0400
Subject: [PATCH 077/169] do not check for migration version if not migrating

---
 awx/conf/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/conf/settings.py b/awx/conf/settings.py
index 4263deaa1d..5770f9052d 100644
--- a/awx/conf/settings.py
+++ b/awx/conf/settings.py
@@ -63,7 +63,7 @@ def _log_database_error():
     try:
         yield
     except (ProgrammingError, OperationalError) as e:
-        if get_tower_migration_version() < '310':
+        if 'migrate' in sys.argv and get_tower_migration_version() < '310':
             logger.info('Using default settings until version 3.1 migration.')
         else:
             logger.warning('Database settings are not available, using defaults (%s)', e, exc_info=True)

From af4e86d70e48e470b40e7a26d73f5672cc44d38c Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Mon, 7 May 2018 11:17:01 -0400
Subject: [PATCH 078/169] Set Id on extra_vars job template form field

---
 awx/ui/client/src/templates/job_templates/job-template.form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js
index 0b240a78ee..31174ac043 100644
--- a/awx/ui/client/src/templates/job_templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job_templates/job-template.form.js
@@ -359,6 +359,7 @@ function(NotificationsList, i18n) {
                     dataTitle: i18n._('Extra Variables'),
                     dataPlacement: 'right',
                     dataContainer: "body",
+                    id: 'extra_vars',
                     subCheckbox: {
                         variable: 'ask_variables_on_launch',
                         text: i18n._('Prompt on launch')

From 1488697001a0982304828e95b8aeb0fbc579790a Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Mon, 7 May 2018 12:19:39 -0400
Subject: [PATCH 079/169] Fix job results panel width in firefox

---
 awx/ui/client/features/output/_index.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/awx/ui/client/features/output/_index.less b/awx/ui/client/features/output/_index.less
index ff83371198..e7b4a43dd9 100644
--- a/awx/ui/client/features/output/_index.less
+++ b/awx/ui/client/features/output/_index.less
@@ -304,6 +304,7 @@
     grid-template-rows: minmax(500px, ~"calc(100vh - 130px)");
 
     .at-Panel {
+        min-width: 0;
         overflow-y: auto;
     }
 }

From 33ef12002fdf5e7994cd42dfc5f799a2aaf63f6c Mon Sep 17 00:00:00 2001
From: Ben Thomasson <bthomass@redhat.com>
Date: Mon, 7 May 2018 13:42:29 -0400
Subject: [PATCH 080/169] Adds websocket for network_ui to the installer
 version of nginx.conf

---
 installer/roles/image_build/files/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/roles/image_build/files/nginx.conf b/installer/roles/image_build/files/nginx.conf
index 391722ea70..1076370021 100644
--- a/installer/roles/image_build/files/nginx.conf
+++ b/installer/roles/image_build/files/nginx.conf
@@ -49,7 +49,7 @@ http {
 
         location /favicon.ico { alias /var/lib/awx/public/static/favicon.ico; }
 
-        location /websocket {
+        location ~ ^/(websocket|network_ui/topology/) {
             # Pass request to the upstream alias
             proxy_pass http://daphne;
             # Require http version 1.1 to allow for upgrade requests

From ea2ddd3bba6a1ad5bbfe785da6c1053e480d2528 Mon Sep 17 00:00:00 2001
From: Alan Rominger <arominge@redhat.com>
Date: Mon, 7 May 2018 14:14:09 -0400
Subject: [PATCH 081/169] Fix syntax error in docs

---
 docs/custom_credential_types.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/custom_credential_types.md b/docs/custom_credential_types.md
index 409fbcfeae..1192b6799c 100644
--- a/docs/custom_credential_types.md
+++ b/docs/custom_credential_types.md
@@ -177,7 +177,7 @@ certificate/key data:
             "template": "[mycloud]\ntoken={{api_token}}"
         },
         "env": {
-            "MY_CLOUD_INI_FILE": "{{tower.filename}"
+            "MY_CLOUD_INI_FILE": "{{tower.filename}}"
         }
     }
 

From 1e38abff916694fb6b2aa634f9365e833b461146 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Mon, 7 May 2018 15:39:10 -0400
Subject: [PATCH 082/169] accurate 400 messages for undefined filename
 namespaces

---
 awx/main/fields.py                 | 30 ++++++++++++++++++++----------
 awx/main/tests/unit/test_fields.py | 16 ++++++++++++++++
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/awx/main/fields.py b/awx/main/fields.py
index 14e1cc6ad0..5f1761277d 100644
--- a/awx/main/fields.py
+++ b/awx/main/fields.py
@@ -802,23 +802,33 @@ class CredentialTypeInjectorField(JSONSchemaField):
             for field in model_instance.defined_fields
         )
 
+        class ExplodingNamespace:
+            def __unicode__(self):
+                raise UndefinedError(_('Must define unnamed file injector in order to reference `tower.filename`.'))
+
         class TowerNamespace:
-            filename = None
+            def __init__(self):
+                self.filename = ExplodingNamespace()
+
+            def __unicode__(self):
+                raise UndefinedError(_('Cannot directly reference reserved `tower` namespace container.'))
+
         valid_namespace['tower'] = TowerNamespace()
 
         # ensure either single file or multi-file syntax is used (but not both)
         template_names = [x for x in value.get('file', {}).keys() if x.startswith('template')]
-        if 'template' in template_names and len(template_names) > 1:
-            raise django_exceptions.ValidationError(
-                _('Must use multi-file syntax when injecting multiple files'),
-                code='invalid',
-                params={'value': value},
-            )
-        if 'template' not in template_names:
-            valid_namespace['tower'].filename = TowerNamespace()
+        if 'template' in template_names:
+            valid_namespace['tower'].filename = 'EXAMPLE_FILENAME'
+            if len(template_names) > 1:
+                raise django_exceptions.ValidationError(
+                    _('Must use multi-file syntax when injecting multiple files'),
+                    code='invalid',
+                    params={'value': value},
+                )
+        elif template_names:
             for template_name in template_names:
                 template_name = template_name.split('.')[1]
-                setattr(valid_namespace['tower'].filename, template_name, 'EXAMPLE')
+                setattr(valid_namespace['tower'].filename, template_name, 'EXAMPLE_FILENAME')
 
         for type_, injector in value.items():
             for key, tmpl in injector.items():
diff --git a/awx/main/tests/unit/test_fields.py b/awx/main/tests/unit/test_fields.py
index bec0c4de2f..79a163b840 100644
--- a/awx/main/tests/unit/test_fields.py
+++ b/awx/main/tests/unit/test_fields.py
@@ -96,10 +96,26 @@ def test_cred_type_input_schema_validity(input_, valid):
     ({'invalid-injector': {}}, False),
     ({'file': 123}, False),
     ({'file': {}}, True),
+    # Uses credential inputs inside of unnamed file contents
     ({'file': {'template': '{{username}}'}}, True),
+    # Uses named file
     ({'file': {'template.username': '{{username}}'}}, True),
+    # Uses multiple named files
     ({'file': {'template.username': '{{username}}', 'template.password': '{{pass}}'}}, True),
+    # Use of unnamed file mutually exclusive with use of named files
     ({'file': {'template': '{{username}}', 'template.password': '{{pass}}'}}, False),
+    # References non-existant named file
+    ({'env': {'FROM_FILE': "{{tower.filename.cert}}"}}, False),
+    # References unnamed file, but a file was never defined
+    ({'env': {'FROM_FILE': "{{tower.filename}}"}}, False),
+    # Cannot reference tower namespace itself (what would this return??)
+    ({'env': {'FROM_FILE': "{{tower}}"}}, False),
+    # References filename of a named file
+    ({'file': {'template.cert': '{{awx_secret}}'}, 'env': {'FROM_FILE': "{{tower.filename.cert}}"}}, True),
+    # With named files, `tower.filename` is another namespace, so it cannot be referenced
+    ({'file': {'template.cert': '{{awx_secret}}'}, 'env': {'FROM_FILE': "{{tower.filename}}"}}, False),
+    # With an unnamed file, `tower.filename` is just the filename
+    ({'file': {'template': '{{awx_secret}}'}, 'env': {'THE_FILENAME': "{{tower.filename}}"}}, True),
     ({'file': {'foo': 'bar'}}, False),
     ({'env': 123}, False),
     ({'env': {}}, True),

From fbe2391b86fb3d41498d699f61ea3f7a25de3600 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Wed, 2 May 2018 15:23:57 -0400
Subject: [PATCH 083/169] provide the timezone so that the UI doesn't have to

this will also ensure that UI doesn't use a different front end library
that will yield different results than the underlying Python code
---
 awx/api/serializers.py                        |  7 ++++-
 awx/api/views.py                              |  6 +---
 awx/main/models/schedules.py                  | 31 ++++++++++++++++++-
 .../tests/functional/models/test_schedule.py  | 15 +++++++++
 4 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 64b709d056..b1e62b8613 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -4511,9 +4511,14 @@ class SchedulePreviewSerializer(BaseSerializer):
 class ScheduleSerializer(LaunchConfigurationBaseSerializer, SchedulePreviewSerializer):
     show_capabilities = ['edit', 'delete']
 
+    timezone = serializers.SerializerMethodField()
+
     class Meta:
         model = Schedule
-        fields = ('*', 'unified_job_template', 'enabled', 'dtstart', 'dtend', 'rrule', 'next_run',)
+        fields = ('*', 'unified_job_template', 'enabled', 'dtstart', 'dtend', 'rrule', 'next_run', 'timezone',)
+
+    def get_timezone(self, obj):
+        return obj.timezone
 
     def get_related(self, obj):
         res = super(ScheduleSerializer, self).get_related(obj)
diff --git a/awx/api/views.py b/awx/api/views.py
index 5e080ccea9..f1098ffce0 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -745,11 +745,7 @@ class ScheduleZoneInfo(APIView):
     swagger_topic = 'System Configuration'
 
     def get(self, request):
-        from dateutil.zoneinfo import get_zonefile_instance
-        return Response([
-            {'name': zone}
-            for zone in sorted(get_zonefile_instance().zones)
-        ])
+        return Response(Schedule.get_zoneinfo())
 
 
 class LaunchConfigCredentialsBase(SubListAttachDetachAPIView):
diff --git a/awx/main/models/schedules.py b/awx/main/models/schedules.py
index 71efa702c6..af75b8e8a3 100644
--- a/awx/main/models/schedules.py
+++ b/awx/main/models/schedules.py
@@ -4,7 +4,9 @@
 import logging
 import datetime
 import dateutil.rrule
-from dateutil.tz import datetime_exists
+from operator import itemgetter
+import dateutil.parser
+from dateutil.tz import datetime_exists, tzutc
 
 # Django
 from django.db import models
@@ -94,6 +96,33 @@ class Schedule(CommonModel, LaunchTimeConfig):
         help_text=_("The next time that the scheduled action will run.")
     )
 
+    @classmethod
+    def get_zoneinfo(self):
+        from dateutil.zoneinfo import get_zonefile_instance
+        return [
+            {'name': zone}
+            for zone in sorted(get_zonefile_instance().zones)
+        ]
+
+    @property
+    def timezone(self):
+        utc = tzutc()
+        _rrule = dateutil.rrule.rrulestr(
+            self.rrule,
+            tzinfos={x: utc for x in dateutil.parser.parserinfo().UTCZONE}
+        )
+        tzinfo = _rrule._dtstart.tzinfo
+        if tzinfo == utc:
+            return 'UTC'
+        fname = tzinfo._filename
+        all_zones = map(itemgetter('name'), Schedule.get_zoneinfo())
+        all_zones.sort(key = lambda x: -len(x))
+        for zone in all_zones:
+            if fname.endswith(zone):
+                return zone
+        logger.warn('Could not detect valid zoneinfo for {}'.format(self.rrule))
+        return ''
+
     @classmethod
     def rrulestr(cls, rrule, **kwargs):
         """
diff --git a/awx/main/tests/functional/models/test_schedule.py b/awx/main/tests/functional/models/test_schedule.py
index 101afa8b99..cb3dcd34ed 100644
--- a/awx/main/tests/functional/models/test_schedule.py
+++ b/awx/main/tests/functional/models/test_schedule.py
@@ -203,3 +203,18 @@ def test_beginning_of_time(job_template):
     )
     with pytest.raises(ValueError):
         s.save()
+
+
+@pytest.mark.django_db
+@pytest.mark.parametrize('rrule, tz', [
+    ['DTSTART:20300112T210000Z RRULE:FREQ=DAILY;INTERVAL=1', 'UTC'],
+    ['DTSTART;TZID=America/New_York:20300112T210000 RRULE:FREQ=DAILY;INTERVAL=1', 'America/New_York']
+])
+def test_timezone_property(job_template, rrule, tz):
+    # ensure that really large generators don't have performance issues
+    s = Schedule(
+        name='Some Schedule',
+        rrule=rrule,
+        unified_job_template=job_template
+    )
+    assert s.timezone == tz

From 441e5cc9c2521b16e8879d7544844fdfe17e56db Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Wed, 2 May 2018 16:24:55 -0400
Subject: [PATCH 084/169] allow naive UNTILs to be specified for schedule
 rrules

---
 awx/main/models/schedules.py                  | 56 ++++++++++++++++++-
 .../tests/functional/models/test_schedule.py  | 26 +++------
 2 files changed, 61 insertions(+), 21 deletions(-)

diff --git a/awx/main/models/schedules.py b/awx/main/models/schedules.py
index af75b8e8a3..565ad2de12 100644
--- a/awx/main/models/schedules.py
+++ b/awx/main/models/schedules.py
@@ -1,8 +1,10 @@
 # Copyright (c) 2015 Ansible, Inc.
 # All Rights Reserved.
 
-import logging
 import datetime
+import logging
+import re
+
 import dateutil.rrule
 from operator import itemgetter
 import dateutil.parser
@@ -11,7 +13,7 @@ from dateutil.tz import datetime_exists, tzutc
 # Django
 from django.db import models
 from django.db.models.query import QuerySet
-from django.utils.timezone import now
+from django.utils.timezone import now, make_aware
 from django.utils.translation import ugettext_lazy as _
 
 # AWX
@@ -129,6 +131,56 @@ class Schedule(CommonModel, LaunchTimeConfig):
         Apply our own custom rrule parsing requirements
         """
         kwargs['forceset'] = True
+
+        #
+        # RFC5545 specifies that the UNTIL rule part MUST ALWAYS be a date
+        # with UTC time.  This is extra work for API implementers because
+        # it requires them to perform DTSTART local -> UTC datetime coercion on
+        # POST and UTC -> DTSTART local coercion on GET.
+        #
+        # This block of code is a departure from the RFC.  If you send an
+        # rrule like this to the API (without a Z on the UNTIL):
+        #
+        # DTSTART;TZID=America/New_York:20180502T150000 RRULE:FREQ=HOURLY;INTERVAL=1;UNTIL=20180502T180000
+        #
+        # ...we'll assume that the naive UNTIL is intended to match the DTSTART
+        # timezone (America/New_York), and so we'll coerce to UTC _for you_
+        # automatically.
+        #
+        if 'until=' in rrule.lower():
+            # if DTSTART;TZID= is used, coerce "naive" UNTIL values
+            # to the proper UTC date
+            match_until = re.match(".*?UNTIL\=(?P<until>[0-9]+T[0-9]+)(?P<utcflag>Z?)", rrule)
+            if not len(match_until.group('utcflag')):
+                # rrule = DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T170000
+
+                # Find the UNTIL=N part of the string
+                # naive_until = 20200601T170000
+                naive_until = match_until.group('until')
+
+                # What is the DTSTART timezone for:
+                # DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T170000Z
+                # local_tz = tzfile('/usr/share/zoneinfo/America/New_York')
+                local_tz = dateutil.rrule.rrulestr(
+                    rrule.replace(naive_until, naive_until + 'Z'),
+                    tzinfos={x: tzutc() for x in dateutil.parser.parserinfo().UTCZONE}
+                )._dtstart.tzinfo
+
+                # Make a datetime object with tzinfo=<the DTSTART timezone>
+                # localized_until = datetime.datetime(2020, 6, 1, 17, 0, tzinfo=tzfile('/usr/share/zoneinfo/America/New_York'))
+                localized_until = make_aware(
+                    datetime.datetime.strptime(naive_until, "%Y%m%dT%H%M%S"),
+                    local_tz
+                )
+
+                # Coerce the datetime to UTC and format it as a string w/ Zulu format
+                # utc_until = 20200601T220000Z
+                utc_until = localized_until.astimezone(pytz.utc).strftime('%Y%m%dT%H%M%SZ')
+
+                # rrule was:    DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T170000
+                # rrule is now: DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T220000Z
+                rrule = rrule.replace(naive_until, utc_until)
+
         x = dateutil.rrule.rrulestr(rrule, **kwargs)
 
         for r in x._rrule:
diff --git a/awx/main/tests/functional/models/test_schedule.py b/awx/main/tests/functional/models/test_schedule.py
index cb3dcd34ed..e89dbf017d 100644
--- a/awx/main/tests/functional/models/test_schedule.py
+++ b/awx/main/tests/functional/models/test_schedule.py
@@ -1,5 +1,6 @@
 from datetime import datetime
 
+from django.utils.timezone import now
 import mock
 import pytest
 import pytz
@@ -131,31 +132,19 @@ def test_utc_until(job_template, until, dtend):
 
 @pytest.mark.django_db
 @pytest.mark.parametrize('dtstart, until', [
-    ['20180601T120000Z', '20180602T170000'],
-    ['TZID=America/New_York:20180601T120000', '20180602T170000'],
+    ['DTSTART:20380601T120000Z', '20380601T170000'],  # noon UTC to 5PM UTC
+    ['DTSTART;TZID=America/New_York:20380601T120000', '20380601T170000'],  # noon EST to 5PM EST
 ])
 def test_tzinfo_naive_until(job_template, dtstart, until):
-    rrule = 'DTSTART;{} RRULE:FREQ=DAILY;INTERVAL=1;UNTIL={}'.format(dtstart, until)  # noqa
+    rrule = '{} RRULE:FREQ=HOURLY;INTERVAL=1;UNTIL={}'.format(dtstart, until)  # noqa
     s = Schedule(
         name='Some Schedule',
         rrule=rrule,
         unified_job_template=job_template
     )
-    with pytest.raises(ValueError):
-        s.save()
-
-
-@pytest.mark.django_db
-def test_until_must_be_utc(job_template):
-    rrule = 'DTSTART;TZID=America/New_York:20180601T120000 RRULE:FREQ=DAILY;INTERVAL=1;UNTIL=20180602T000000'  # noqa the Z is required
-    s = Schedule(
-        name='Some Schedule',
-        rrule=rrule,
-        unified_job_template=job_template
-    )
-    with pytest.raises(ValueError) as e:
-        s.save()
-    assert 'RRULE UNTIL values must be specified in UTC' in str(e)
+    s.save()
+    gen = Schedule.rrulestr(s.rrule).xafter(now(), count=20)
+    assert len(list(gen)) == 6  # noon, 1PM, 2, 3, 4, 5PM
 
 
 @pytest.mark.django_db
@@ -211,7 +200,6 @@ def test_beginning_of_time(job_template):
     ['DTSTART;TZID=America/New_York:20300112T210000 RRULE:FREQ=DAILY;INTERVAL=1', 'America/New_York']
 ])
 def test_timezone_property(job_template, rrule, tz):
-    # ensure that really large generators don't have performance issues
     s = Schedule(
         name='Some Schedule',
         rrule=rrule,

From cb91b97fd0d9f7d8a02a5b7434685a4e58f1476f Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Mon, 7 May 2018 17:35:14 -0400
Subject: [PATCH 085/169] Update pot files

---
 awx/locale/django.pot          | 2980 ++++++++++++++++++--------------
 awx/ui/po/ansible-tower-ui.pot | 2808 ++++++++++++++++--------------
 2 files changed, 3196 insertions(+), 2592 deletions(-)

diff --git a/awx/locale/django.pot b/awx/locale/django.pot
index fc8c1554da..af37525098 100644
--- a/awx/locale/django.pot
+++ b/awx/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-30 20:23+0000\n"
+"POT-Creation-Date: 2018-05-07 21:24+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,91 +17,105 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: awx/api/authentication.py:67
-msgid "Invalid token header. No credentials provided."
-msgstr ""
-
-#: awx/api/authentication.py:70
-msgid "Invalid token header. Token string should not contain spaces."
-msgstr ""
-
-#: awx/api/authentication.py:105
-msgid "User inactive or deleted"
-msgstr ""
-
-#: awx/api/authentication.py:161
-msgid "Invalid task token"
-msgstr ""
-
-#: awx/api/conf.py:12
+#: awx/api/conf.py:15
 msgid "Idle Time Force Log Out"
 msgstr ""
 
-#: awx/api/conf.py:13
+#: awx/api/conf.py:16
 msgid ""
 "Number of seconds that a user is inactive before they will need to login "
 "again."
 msgstr ""
 
-#: awx/api/conf.py:14 awx/api/conf.py:24 awx/api/conf.py:33 awx/sso/conf.py:85
-#: awx/sso/conf.py:96 awx/sso/conf.py:108 awx/sso/conf.py:123
+#: awx/api/conf.py:17 awx/api/conf.py:26 awx/api/conf.py:34 awx/api/conf.py:47
+#: awx/sso/conf.py:85 awx/sso/conf.py:96 awx/sso/conf.py:108
+#: awx/sso/conf.py:123
 msgid "Authentication"
 msgstr ""
 
-#: awx/api/conf.py:22
-msgid "Maximum number of simultaneous logins"
+#: awx/api/conf.py:24
+msgid "Maximum number of simultaneous logged in sessions"
 msgstr ""
 
-#: awx/api/conf.py:23
+#: awx/api/conf.py:25
 msgid ""
-"Maximum number of simultaneous logins a user may have. To disable enter -1."
-msgstr ""
-
-#: awx/api/conf.py:31
-msgid "Enable HTTP Basic Auth"
+"Maximum number of simultaneous logged in sessions a user may have. To "
+"disable enter -1."
 msgstr ""
 
 #: awx/api/conf.py:32
+msgid "Enable HTTP Basic Auth"
+msgstr ""
+
+#: awx/api/conf.py:33
 msgid "Enable HTTP Basic Auth for the API Browser."
 msgstr ""
 
-#: awx/api/filters.py:129
+#: awx/api/conf.py:42
+msgid "OAuth 2 Timeout Settings"
+msgstr ""
+
+#: awx/api/conf.py:43
+msgid ""
+"Dictionary for customizing OAuth 2 timeouts, available items are "
+"`ACCESS_TOKEN_EXPIRE_SECONDS`, the duration of access tokens in the number "
+"of seconds, and `AUTHORIZATION_CODE_EXPIRE_SECONDS`, the duration of "
+"authorization grants in the number of seconds."
+msgstr ""
+
+#: awx/api/exceptions.py:16
+msgid "Resource is being used by running jobs."
+msgstr ""
+
+#: awx/api/fields.py:81
+#, python-brace-format
+msgid "Invalid key names: {invalid_key_names}"
+msgstr ""
+
+#: awx/api/fields.py:107
+msgid "Credential {} does not exist"
+msgstr ""
+
+#: awx/api/filters.py:96
+msgid "No related model for field {}."
+msgstr ""
+
+#: awx/api/filters.py:113
 msgid "Filtering on password fields is not allowed."
 msgstr ""
 
-#: awx/api/filters.py:141 awx/api/filters.py:143
+#: awx/api/filters.py:125 awx/api/filters.py:127
 #, python-format
 msgid "Filtering on %s is not allowed."
 msgstr ""
 
-#: awx/api/filters.py:146
+#: awx/api/filters.py:130
 msgid "Loops not allowed in filters, detected on field {}."
 msgstr ""
 
-#: awx/api/filters.py:171
+#: awx/api/filters.py:159
+msgid "Query string field name not provided."
+msgstr ""
+
+#: awx/api/filters.py:186
 #, python-brace-format
 msgid "Invalid {field_name} id: {field_id}"
 msgstr ""
 
-#: awx/api/filters.py:302
+#: awx/api/filters.py:319
 #, python-format
 msgid "cannot filter on kind %s"
 msgstr ""
 
-#: awx/api/filters.py:409
-#, python-format
-msgid "cannot order by field %s"
-msgstr ""
-
-#: awx/api/generics.py:550 awx/api/generics.py:612
+#: awx/api/generics.py:600 awx/api/generics.py:662
 msgid "\"id\" field must be an integer."
 msgstr ""
 
-#: awx/api/generics.py:609
+#: awx/api/generics.py:659
 msgid "\"id\" is required to disassociate"
 msgstr ""
 
-#: awx/api/generics.py:660
+#: awx/api/generics.py:710
 msgid "{} 'id' field is missing."
 msgstr ""
 
@@ -141,872 +155,1060 @@ msgstr ""
 msgid "Timestamp when this {} was last modified."
 msgstr ""
 
-#: awx/api/parsers.py:64
+#: awx/api/parsers.py:33
 msgid "JSON parse error - not a JSON object"
 msgstr ""
 
-#: awx/api/parsers.py:67
+#: awx/api/parsers.py:36
 #, python-format
 msgid ""
 "JSON parse error - %s\n"
 "Possible cause: trailing comma."
 msgstr ""
 
-#: awx/api/serializers.py:268
+#: awx/api/serializers.py:153
+msgid ""
+"The original object is already named {}, a copy from it cannot have the same "
+"name."
+msgstr ""
+
+#: awx/api/serializers.py:295
 msgid "Playbook Run"
 msgstr ""
 
-#: awx/api/serializers.py:269
+#: awx/api/serializers.py:296
 msgid "Command"
 msgstr ""
 
-#: awx/api/serializers.py:270 awx/main/models/unified_jobs.py:435
+#: awx/api/serializers.py:297 awx/main/models/unified_jobs.py:525
 msgid "SCM Update"
 msgstr ""
 
-#: awx/api/serializers.py:271
+#: awx/api/serializers.py:298
 msgid "Inventory Sync"
 msgstr ""
 
-#: awx/api/serializers.py:272
+#: awx/api/serializers.py:299
 msgid "Management Job"
 msgstr ""
 
-#: awx/api/serializers.py:273
+#: awx/api/serializers.py:300
 msgid "Workflow Job"
 msgstr ""
 
-#: awx/api/serializers.py:274
+#: awx/api/serializers.py:301
 msgid "Workflow Template"
 msgstr ""
 
-#: awx/api/serializers.py:701 awx/api/serializers.py:759 awx/api/views.py:4365
-#, python-format
+#: awx/api/serializers.py:696
 msgid ""
-"Standard Output too large to display (%(text_size)d bytes), only download "
-"supported for sizes over %(supported_size)d bytes"
+"Indicates whether all of the events generated by this unified job have been "
+"saved to the database."
 msgstr ""
 
-#: awx/api/serializers.py:774
+#: awx/api/serializers.py:852
 msgid "Write-only field used to change the password."
 msgstr ""
 
-#: awx/api/serializers.py:776
+#: awx/api/serializers.py:854
 msgid "Set if the account is managed by an external service"
 msgstr ""
 
-#: awx/api/serializers.py:800
+#: awx/api/serializers.py:878
 msgid "Password required for new User."
 msgstr ""
 
-#: awx/api/serializers.py:886
+#: awx/api/serializers.py:969
 #, python-format
 msgid "Unable to change %s on user managed by LDAP."
 msgstr ""
 
-#: awx/api/serializers.py:1050
+#: awx/api/serializers.py:1169
+msgid "Must be a simple space-separated string with allowed scopes {}."
+msgstr ""
+
+#: awx/api/serializers.py:1386
+msgid "This path is already being used by another manual project."
+msgstr ""
+
+#: awx/api/serializers.py:1467
 msgid "Organization is missing"
 msgstr ""
 
-#: awx/api/serializers.py:1054
+#: awx/api/serializers.py:1471
 msgid "Update options must be set to false for manual projects."
 msgstr ""
 
-#: awx/api/serializers.py:1060
+#: awx/api/serializers.py:1477
 msgid "Array of playbooks available within this project."
 msgstr ""
 
-#: awx/api/serializers.py:1079
+#: awx/api/serializers.py:1496
 msgid ""
 "Array of inventory files and directories available within this project, not "
 "comprehensive."
 msgstr ""
 
-#: awx/api/serializers.py:1201
+#: awx/api/serializers.py:1629
 msgid "Smart inventories must specify host_filter"
 msgstr ""
 
-#: awx/api/serializers.py:1303
+#: awx/api/serializers.py:1733
 #, python-format
 msgid "Invalid port specification: %s"
 msgstr ""
 
-#: awx/api/serializers.py:1314
+#: awx/api/serializers.py:1744
 msgid "Cannot create Host for Smart Inventory"
 msgstr ""
 
-#: awx/api/serializers.py:1336 awx/api/serializers.py:3321
-#: awx/api/serializers.py:3406 awx/main/validators.py:198
-msgid "Must be valid JSON or YAML."
-msgstr ""
-
-#: awx/api/serializers.py:1432
+#: awx/api/serializers.py:1856
 msgid "Invalid group name."
 msgstr ""
 
-#: awx/api/serializers.py:1437
+#: awx/api/serializers.py:1861
 msgid "Cannot create Group for Smart Inventory"
 msgstr ""
 
-#: awx/api/serializers.py:1509
+#: awx/api/serializers.py:1936
 msgid ""
 "Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python"
 msgstr ""
 
-#: awx/api/serializers.py:1555
+#: awx/api/serializers.py:1984
 msgid "`{}` is a prohibited environment variable"
 msgstr ""
 
-#: awx/api/serializers.py:1566
+#: awx/api/serializers.py:1995
 msgid "If 'source' is 'custom', 'source_script' must be provided."
 msgstr ""
 
-#: awx/api/serializers.py:1572
+#: awx/api/serializers.py:2001
 msgid "Must provide an inventory."
 msgstr ""
 
-#: awx/api/serializers.py:1576
+#: awx/api/serializers.py:2005
 msgid ""
 "The 'source_script' does not belong to the same organization as the "
 "inventory."
 msgstr ""
 
-#: awx/api/serializers.py:1578
+#: awx/api/serializers.py:2007
 msgid "'source_script' doesn't exist."
 msgstr ""
 
-#: awx/api/serializers.py:1602
+#: awx/api/serializers.py:2041
 msgid "Automatic group relationship, will be removed in 3.3"
 msgstr ""
 
-#: awx/api/serializers.py:1679
+#: awx/api/serializers.py:2127
 msgid "Cannot use manual project for SCM-based inventory."
 msgstr ""
 
-#: awx/api/serializers.py:1685
+#: awx/api/serializers.py:2133
 msgid ""
 "Manual inventory sources are created automatically when a group is created "
 "in the v1 API."
 msgstr ""
 
-#: awx/api/serializers.py:1690
+#: awx/api/serializers.py:2138
 msgid "Setting not compatible with existing schedules."
 msgstr ""
 
-#: awx/api/serializers.py:1695
+#: awx/api/serializers.py:2143
 msgid "Cannot create Inventory Source for Smart Inventory"
 msgstr ""
 
-#: awx/api/serializers.py:1709
+#: awx/api/serializers.py:2194
 #, python-format
 msgid "Cannot set %s if not SCM type."
 msgstr ""
 
-#: awx/api/serializers.py:1950
+#: awx/api/serializers.py:2461
 msgid "Modifications not allowed for managed credential types"
 msgstr ""
 
-#: awx/api/serializers.py:1955
+#: awx/api/serializers.py:2466
 msgid ""
 "Modifications to inputs are not allowed for credential types that are in use"
 msgstr ""
 
-#: awx/api/serializers.py:1961
+#: awx/api/serializers.py:2472
 #, python-format
 msgid "Must be 'cloud' or 'net', not %s"
 msgstr ""
 
-#: awx/api/serializers.py:1967
+#: awx/api/serializers.py:2478
 msgid "'ask_at_runtime' is not supported for custom credentials."
 msgstr ""
 
-#: awx/api/serializers.py:2140
+#: awx/api/serializers.py:2656
 #, python-format
 msgid "\"%s\" is not a valid choice"
 msgstr ""
 
-#: awx/api/serializers.py:2159
-#, python-format
-msgid "'%s' is not a valid field for %s"
+#: awx/api/serializers.py:2675
+#, python-brace-format
+msgid "'{field_name}' is not a valid field for {credential_type_name}"
 msgstr ""
 
-#: awx/api/serializers.py:2180
+#: awx/api/serializers.py:2696
 msgid ""
 "You cannot change the credential type of the credential, as it may break the "
 "functionality of the resources using it."
 msgstr ""
 
-#: awx/api/serializers.py:2191
+#: awx/api/serializers.py:2708
 msgid ""
 "Write-only field used to add user to owner role. If provided, do not give "
 "either team or organization. Only valid for creation."
 msgstr ""
 
-#: awx/api/serializers.py:2196
+#: awx/api/serializers.py:2713
 msgid ""
 "Write-only field used to add team to owner role. If provided, do not give "
 "either user or organization. Only valid for creation."
 msgstr ""
 
-#: awx/api/serializers.py:2201
+#: awx/api/serializers.py:2718
 msgid ""
 "Inherit permissions from organization roles. If provided on creation, do not "
 "give either user or team."
 msgstr ""
 
-#: awx/api/serializers.py:2217
+#: awx/api/serializers.py:2734
 msgid "Missing 'user', 'team', or 'organization'."
 msgstr ""
 
-#: awx/api/serializers.py:2257
+#: awx/api/serializers.py:2774
 msgid ""
 "Credential organization must be set and match before assigning to a team"
 msgstr ""
 
-#: awx/api/serializers.py:2424
+#: awx/api/serializers.py:2974
 msgid "You must provide a cloud credential."
 msgstr ""
 
-#: awx/api/serializers.py:2425
+#: awx/api/serializers.py:2975
 msgid "You must provide a network credential."
 msgstr ""
 
-#: awx/api/serializers.py:2441
+#: awx/api/serializers.py:2976 awx/main/models/jobs.py:155
+msgid "You must provide an SSH credential."
+msgstr ""
+
+#: awx/api/serializers.py:2977
+msgid "You must provide a vault credential."
+msgstr ""
+
+#: awx/api/serializers.py:2996
 msgid "This field is required."
 msgstr ""
 
-#: awx/api/serializers.py:2443 awx/api/serializers.py:2445
+#: awx/api/serializers.py:2998 awx/api/serializers.py:3000
 msgid "Playbook not found for project."
 msgstr ""
 
-#: awx/api/serializers.py:2447
+#: awx/api/serializers.py:3002
 msgid "Must select playbook for project."
 msgstr ""
 
-#: awx/api/serializers.py:2522
+#: awx/api/serializers.py:3082
+msgid "Cannot enable provisioning callback without an inventory set."
+msgstr ""
+
+#: awx/api/serializers.py:3085
 msgid "Must either set a default value or ask to prompt on launch."
 msgstr ""
 
-#: awx/api/serializers.py:2524 awx/main/models/jobs.py:326
+#: awx/api/serializers.py:3087 awx/main/models/jobs.py:310
 msgid "Job types 'run' and 'check' must have assigned a project."
 msgstr ""
 
-#: awx/api/serializers.py:2611
+#: awx/api/serializers.py:3203
 msgid "Invalid job template."
 msgstr ""
 
-#: awx/api/serializers.py:2708
-msgid "Neither credential nor vault credential provided."
+#: awx/api/serializers.py:3276
+msgid "No change to job limit"
 msgstr ""
 
-#: awx/api/serializers.py:2711
+#: awx/api/serializers.py:3277
+msgid "All failed and unreachable hosts"
+msgstr ""
+
+#: awx/api/serializers.py:3292
+msgid "Missing passwords needed to start: {}"
+msgstr ""
+
+#: awx/api/serializers.py:3311
+msgid "Relaunch by host status not available until job finishes running."
+msgstr ""
+
+#: awx/api/serializers.py:3325
 msgid "Job Template Project is missing or undefined."
 msgstr ""
 
-#: awx/api/serializers.py:2713
+#: awx/api/serializers.py:3327
 msgid "Job Template Inventory is missing or undefined."
 msgstr ""
 
-#: awx/api/serializers.py:2782 awx/main/tasks.py:2186
+#: awx/api/serializers.py:3365
+msgid "Unknown, job may have been ran before launch configurations were saved."
+msgstr ""
+
+#: awx/api/serializers.py:3432 awx/main/tasks.py:2238
 msgid "{} are prohibited from use in ad hoc commands."
 msgstr ""
 
-#: awx/api/serializers.py:3008
-#, python-format
-msgid "%(job_type)s is not a valid job type. The choices are %(choices)s."
+#: awx/api/serializers.py:3501 awx/api/views.py:4763
+#, python-brace-format
+msgid ""
+"Standard Output too large to display ({text_size} bytes), only download "
+"supported for sizes over {supported_size} bytes."
 msgstr ""
 
-#: awx/api/serializers.py:3013
-msgid "Workflow job template is missing during creation."
+#: awx/api/serializers.py:3697
+msgid "Provided variable {} has no database value to replace with."
 msgstr ""
 
-#: awx/api/serializers.py:3018
+#: awx/api/serializers.py:3773
 #, python-format
 msgid "Cannot nest a %s inside a WorkflowJobTemplate"
 msgstr ""
 
-#: awx/api/serializers.py:3291
-#, python-format
-msgid "Job Template '%s' is missing or undefined."
+#: awx/api/serializers.py:3780 awx/api/views.py:776
+msgid "Related template is not configured to accept credentials on launch."
 msgstr ""
 
-#: awx/api/serializers.py:3294
+#: awx/api/serializers.py:4234
 msgid "The inventory associated with this Job Template is being deleted."
 msgstr ""
 
-#: awx/api/serializers.py:3335 awx/api/views.py:3023
-#, python-format
-msgid "Cannot assign multiple %s credentials."
+#: awx/api/serializers.py:4236
+msgid "The provided inventory is being deleted."
 msgstr ""
 
-#: awx/api/serializers.py:3337 awx/api/views.py:3026
-msgid "Extra credentials must be network or cloud."
+#: awx/api/serializers.py:4244
+msgid "Cannot assign multiple {} credentials."
 msgstr ""
 
-#: awx/api/serializers.py:3474
+#: awx/api/serializers.py:4257
+msgid ""
+"Removing {} credential at launch time without replacement is not supported. "
+"Provided list lacked credential(s): {}."
+msgstr ""
+
+#: awx/api/serializers.py:4382
 msgid ""
 "Missing required fields for Notification Configuration: notification_type"
 msgstr ""
 
-#: awx/api/serializers.py:3497
+#: awx/api/serializers.py:4405
 msgid "No values specified for field '{}'"
 msgstr ""
 
-#: awx/api/serializers.py:3502
+#: awx/api/serializers.py:4410
 msgid "Missing required fields for Notification Configuration: {}."
 msgstr ""
 
-#: awx/api/serializers.py:3505
+#: awx/api/serializers.py:4413
 msgid "Configuration field '{}' incorrect type, expected {}."
 msgstr ""
 
-#: awx/api/serializers.py:3558
-msgid "Inventory Source must be a cloud resource."
-msgstr ""
-
-#: awx/api/serializers.py:3560
-msgid "Manual Project cannot have a schedule set."
-msgstr ""
-
-#: awx/api/serializers.py:3563
+#: awx/api/serializers.py:4475
 msgid ""
-"Inventory sources with `update_on_project_update` cannot be scheduled. "
-"Schedule its source project `{}` instead."
+"Valid DTSTART required in rrule. Value should start with: DTSTART:"
+"YYYYMMDDTHHMMSSZ"
 msgstr ""
 
-#: awx/api/serializers.py:3582
-msgid "Projects and inventory updates cannot accept extra variables."
+#: awx/api/serializers.py:4477
+msgid ""
+"DTSTART cannot be a naive datetime.  Specify ;TZINFO= or YYYYMMDDTHHMMSSZZ."
 msgstr ""
 
-#: awx/api/serializers.py:3604
-msgid "DTSTART required in rrule. Value should match: DTSTART:YYYYMMDDTHHMMSSZ"
-msgstr ""
-
-#: awx/api/serializers.py:3606
+#: awx/api/serializers.py:4479
 msgid "Multiple DTSTART is not supported."
 msgstr ""
 
-#: awx/api/serializers.py:3608
-msgid "RRULE require in rrule."
+#: awx/api/serializers.py:4481
+msgid "RRULE required in rrule."
 msgstr ""
 
-#: awx/api/serializers.py:3610
+#: awx/api/serializers.py:4483
 msgid "Multiple RRULE is not supported."
 msgstr ""
 
-#: awx/api/serializers.py:3612
+#: awx/api/serializers.py:4485
 msgid "INTERVAL required in rrule."
 msgstr ""
 
-#: awx/api/serializers.py:3614
-msgid "TZID is not supported."
-msgstr ""
-
-#: awx/api/serializers.py:3616
+#: awx/api/serializers.py:4487
 msgid "SECONDLY is not supported."
 msgstr ""
 
-#: awx/api/serializers.py:3618
+#: awx/api/serializers.py:4489
 msgid "Multiple BYMONTHDAYs not supported."
 msgstr ""
 
-#: awx/api/serializers.py:3620
+#: awx/api/serializers.py:4491
 msgid "Multiple BYMONTHs not supported."
 msgstr ""
 
-#: awx/api/serializers.py:3622
+#: awx/api/serializers.py:4493
 msgid "BYDAY with numeric prefix not supported."
 msgstr ""
 
-#: awx/api/serializers.py:3624
+#: awx/api/serializers.py:4495
 msgid "BYYEARDAY not supported."
 msgstr ""
 
-#: awx/api/serializers.py:3626
+#: awx/api/serializers.py:4497
 msgid "BYWEEKNO not supported."
 msgstr ""
 
-#: awx/api/serializers.py:3630
+#: awx/api/serializers.py:4499
+msgid "RRULE may not contain both COUNT and UNTIL"
+msgstr ""
+
+#: awx/api/serializers.py:4503
 msgid "COUNT > 999 is unsupported."
 msgstr ""
 
-#: awx/api/serializers.py:3634
-msgid "rrule parsing failed validation."
+#: awx/api/serializers.py:4507
+msgid "rrule parsing failed validation: {}"
 msgstr ""
 
-#: awx/api/serializers.py:3760
+#: awx/api/serializers.py:4538
+msgid "Inventory Source must be a cloud resource."
+msgstr ""
+
+#: awx/api/serializers.py:4540
+msgid "Manual Project cannot have a schedule set."
+msgstr ""
+
+#: awx/api/serializers.py:4553
+msgid ""
+"Count of jobs in the running or waiting state that are targeted for this "
+"instance"
+msgstr ""
+
+#: awx/api/serializers.py:4593
+msgid ""
+"Minimum percentage of all instances that will be automatically assigned to "
+"this group when new instances come online."
+msgstr ""
+
+#: awx/api/serializers.py:4598
+msgid ""
+"Static minimum number of Instances that will be automatically assign to this "
+"group when new instances come online."
+msgstr ""
+
+#: awx/api/serializers.py:4603
+msgid "List of exact-match Instances that will be assigned to this group"
+msgstr ""
+
+#: awx/api/serializers.py:4624
+msgid "Duplicate entry {}."
+msgstr ""
+
+#: awx/api/serializers.py:4626
+msgid "{} is not a valid hostname of an existing instance."
+msgstr ""
+
+#: awx/api/serializers.py:4631
+msgid "tower instance group name may not be changed."
+msgstr ""
+
+#: awx/api/serializers.py:4711
 msgid ""
 "A summary of the new and changed values when an object is created, updated, "
 "or deleted"
 msgstr ""
 
-#: awx/api/serializers.py:3762
+#: awx/api/serializers.py:4713
 msgid ""
 "For create, update, and delete events this is the object type that was "
 "affected. For associate and disassociate events this is the object type "
 "associated or disassociated with object2."
 msgstr ""
 
-#: awx/api/serializers.py:3765
+#: awx/api/serializers.py:4716
 msgid ""
 "Unpopulated for create, update, and delete events. For associate and "
 "disassociate events this is the object type that object1 is being associated "
 "with."
 msgstr ""
 
-#: awx/api/serializers.py:3768
+#: awx/api/serializers.py:4719
 msgid "The action taken with respect to the given object(s)."
 msgstr ""
 
-#: awx/api/serializers.py:3885
-msgid "Unable to login with provided credentials."
-msgstr ""
-
-#: awx/api/serializers.py:3887
-msgid "Must include \"username\" and \"password\"."
-msgstr ""
-
-#: awx/api/views.py:108
+#: awx/api/views.py:116
 msgid "Your license does not allow use of the activity stream."
 msgstr ""
 
-#: awx/api/views.py:118
+#: awx/api/views.py:126
 msgid "Your license does not permit use of system tracking."
 msgstr ""
 
-#: awx/api/views.py:128
+#: awx/api/views.py:136
 msgid "Your license does not allow use of workflows."
 msgstr ""
 
-#: awx/api/views.py:142
+#: awx/api/views.py:150
 msgid "Cannot delete job resource when associated workflow job is running."
 msgstr ""
 
-#: awx/api/views.py:146
+#: awx/api/views.py:155
 msgid "Cannot delete running job resource."
 msgstr ""
 
-#: awx/api/views.py:155 awx/templates/rest_framework/api.html:28
+#: awx/api/views.py:160
+msgid "Job has not finished processing events."
+msgstr ""
+
+#: awx/api/views.py:219
+msgid "Related job {} is still processing events."
+msgstr ""
+
+#: awx/api/views.py:226 awx/templates/rest_framework/api.html:28
 msgid "REST API"
 msgstr ""
 
-#: awx/api/views.py:164 awx/templates/rest_framework/api.html:4
+#: awx/api/views.py:236 awx/templates/rest_framework/api.html:4
 msgid "AWX REST API"
 msgstr ""
 
-#: awx/api/views.py:226
+#: awx/api/views.py:250
+msgid "API OAuth 2 Authorization Root"
+msgstr ""
+
+#: awx/api/views.py:315
 msgid "Version 1"
 msgstr ""
 
-#: awx/api/views.py:230
+#: awx/api/views.py:319
 msgid "Version 2"
 msgstr ""
 
-#: awx/api/views.py:241
+#: awx/api/views.py:328
 msgid "Ping"
 msgstr ""
 
-#: awx/api/views.py:272 awx/conf/apps.py:12
+#: awx/api/views.py:359 awx/conf/apps.py:10
 msgid "Configuration"
 msgstr ""
 
-#: awx/api/views.py:325
+#: awx/api/views.py:414
 msgid "Invalid license data"
 msgstr ""
 
-#: awx/api/views.py:327
+#: awx/api/views.py:416
 msgid "Missing 'eula_accepted' property"
 msgstr ""
 
-#: awx/api/views.py:331
+#: awx/api/views.py:420
 msgid "'eula_accepted' value is invalid"
 msgstr ""
 
-#: awx/api/views.py:334
+#: awx/api/views.py:423
 msgid "'eula_accepted' must be True"
 msgstr ""
 
-#: awx/api/views.py:341
+#: awx/api/views.py:430
 msgid "Invalid JSON"
 msgstr ""
 
-#: awx/api/views.py:349
+#: awx/api/views.py:438
 msgid "Invalid License"
 msgstr ""
 
-#: awx/api/views.py:359
+#: awx/api/views.py:448
 msgid "Invalid license"
 msgstr ""
 
-#: awx/api/views.py:367
+#: awx/api/views.py:456
 #, python-format
 msgid "Failed to remove license (%s)"
 msgstr ""
 
-#: awx/api/views.py:372
+#: awx/api/views.py:461
 msgid "Dashboard"
 msgstr ""
 
-#: awx/api/views.py:471
+#: awx/api/views.py:560
 msgid "Dashboard Jobs Graphs"
 msgstr ""
 
-#: awx/api/views.py:507
+#: awx/api/views.py:596
 #, python-format
 msgid "Unknown period \"%s\""
 msgstr ""
 
-#: awx/api/views.py:521
+#: awx/api/views.py:610
 msgid "Instances"
 msgstr ""
 
-#: awx/api/views.py:529
+#: awx/api/views.py:617
 msgid "Instance Detail"
 msgstr ""
 
-#: awx/api/views.py:537
-msgid "Instance Running Jobs"
+#: awx/api/views.py:638
+msgid "Instance Jobs"
 msgstr ""
 
-#: awx/api/views.py:552
+#: awx/api/views.py:652
 msgid "Instance's Instance Groups"
 msgstr ""
 
-#: awx/api/views.py:562
+#: awx/api/views.py:661
 msgid "Instance Groups"
 msgstr ""
 
-#: awx/api/views.py:570
+#: awx/api/views.py:669
 msgid "Instance Group Detail"
 msgstr ""
 
-#: awx/api/views.py:578
+#: awx/api/views.py:677
+msgid "Isolated Groups can not be removed from the API"
+msgstr ""
+
+#: awx/api/views.py:679
+msgid ""
+"Instance Groups acting as a controller for an Isolated Group can not be "
+"removed from the API"
+msgstr ""
+
+#: awx/api/views.py:685
 msgid "Instance Group Running Jobs"
 msgstr ""
 
-#: awx/api/views.py:588
+#: awx/api/views.py:694
 msgid "Instance Group's Instances"
 msgstr ""
 
-#: awx/api/views.py:598
+#: awx/api/views.py:703
 msgid "Schedules"
 msgstr ""
 
-#: awx/api/views.py:617
+#: awx/api/views.py:717
+msgid "Schedule Recurrence Rule Preview"
+msgstr ""
+
+#: awx/api/views.py:763
+msgid "Cannot assign credential when related template is null."
+msgstr ""
+
+#: awx/api/views.py:768
+msgid "Related template cannot accept {} on launch."
+msgstr ""
+
+#: awx/api/views.py:770
+msgid ""
+"Credential that requires user input on launch cannot be used in saved launch "
+"configuration."
+msgstr ""
+
+#: awx/api/views.py:778
+#, python-brace-format
+msgid ""
+"This launch configuration already provides a {credential_type} credential."
+msgstr ""
+
+#: awx/api/views.py:781
+#, python-brace-format
+msgid "Related template already uses {credential_type} credential."
+msgstr ""
+
+#: awx/api/views.py:799
 msgid "Schedule Jobs List"
 msgstr ""
 
-#: awx/api/views.py:843
+#: awx/api/views.py:954
 msgid "Your license only permits a single organization to exist."
 msgstr ""
 
-#: awx/api/views.py:1079 awx/api/views.py:4666
+#: awx/api/views.py:1183 awx/api/views.py:4972
 msgid "You cannot assign an Organization role as a child role for a Team."
 msgstr ""
 
-#: awx/api/views.py:1083 awx/api/views.py:4680
+#: awx/api/views.py:1187 awx/api/views.py:4986
 msgid "You cannot grant system-level permissions to a team."
 msgstr ""
 
-#: awx/api/views.py:1090 awx/api/views.py:4672
+#: awx/api/views.py:1194 awx/api/views.py:4978
 msgid ""
 "You cannot grant credential access to a team when the Organization field "
 "isn't set, or belongs to a different organization"
 msgstr ""
 
-#: awx/api/views.py:1180
-msgid "Cannot delete project."
-msgstr ""
-
-#: awx/api/views.py:1215
+#: awx/api/views.py:1306
 msgid "Project Schedules"
 msgstr ""
 
-#: awx/api/views.py:1227
+#: awx/api/views.py:1317
 msgid "Project SCM Inventory Sources"
 msgstr ""
 
-#: awx/api/views.py:1354
+#: awx/api/views.py:1417
+msgid "Project Update Events List"
+msgstr ""
+
+#: awx/api/views.py:1430
+msgid "System Job Events List"
+msgstr ""
+
+#: awx/api/views.py:1443
+msgid "Inventory Update Events List"
+msgstr ""
+
+#: awx/api/views.py:1475
 msgid "Project Update SCM Inventory Updates"
 msgstr ""
 
-#: awx/api/views.py:1409
+#: awx/api/views.py:1533
 msgid "Me"
 msgstr ""
 
-#: awx/api/views.py:1453 awx/api/views.py:4623
-msgid "You may not perform any action with your own admin_role."
+#: awx/api/views.py:1541
+msgid "OAuth 2 Applications"
 msgstr ""
 
-#: awx/api/views.py:1459 awx/api/views.py:4627
-msgid "You may not change the membership of a users admin_role"
+#: awx/api/views.py:1550
+msgid "OAuth 2 Application Detail"
 msgstr ""
 
-#: awx/api/views.py:1464 awx/api/views.py:4632
+#: awx/api/views.py:1559
+msgid "OAuth 2 Application Tokens"
+msgstr ""
+
+#: awx/api/views.py:1580
+msgid "OAuth2 Tokens"
+msgstr ""
+
+#: awx/api/views.py:1589
+msgid "OAuth2 Authorized Access Tokens"
+msgstr ""
+
+#: awx/api/views.py:1604
+msgid "OAuth2 User Authorized Access Tokens"
+msgstr ""
+
+#: awx/api/views.py:1619
+msgid "Organization OAuth2 Applications"
+msgstr ""
+
+#: awx/api/views.py:1631
+msgid "OAuth2 Personal Access Tokens"
+msgstr ""
+
+#: awx/api/views.py:1646
+msgid "OAuth Token Detail"
+msgstr ""
+
+#: awx/api/views.py:1704 awx/api/views.py:4939
 msgid ""
 "You cannot grant credential access to a user not in the credentials' "
 "organization"
 msgstr ""
 
-#: awx/api/views.py:1468 awx/api/views.py:4636
+#: awx/api/views.py:1708 awx/api/views.py:4943
 msgid "You cannot grant private credential access to another user"
 msgstr ""
 
-#: awx/api/views.py:1566
+#: awx/api/views.py:1805
 #, python-format
 msgid "Cannot change %s."
 msgstr ""
 
-#: awx/api/views.py:1572
+#: awx/api/views.py:1811
 msgid "Cannot delete user."
 msgstr ""
 
-#: awx/api/views.py:1601
+#: awx/api/views.py:1835
 msgid "Deletion not allowed for managed credential types"
 msgstr ""
 
-#: awx/api/views.py:1603
+#: awx/api/views.py:1837
 msgid "Credential types that are in use cannot be deleted"
 msgstr ""
 
-#: awx/api/views.py:1781
+#: awx/api/views.py:2009
 msgid "Cannot delete inventory script."
 msgstr ""
 
-#: awx/api/views.py:1866
+#: awx/api/views.py:2099
 #, python-brace-format
 msgid "{0}"
 msgstr ""
 
-#: awx/api/views.py:2101
+#: awx/api/views.py:2326
 msgid "Fact not found."
 msgstr ""
 
-#: awx/api/views.py:2125
+#: awx/api/views.py:2348
 msgid "SSLError while trying to connect to {}"
 msgstr ""
 
-#: awx/api/views.py:2127
+#: awx/api/views.py:2350
 msgid "Request to {} timed out."
 msgstr ""
 
-#: awx/api/views.py:2129
-msgid "Unkown exception {} while trying to GET {}"
+#: awx/api/views.py:2352
+msgid "Unknown exception {} while trying to GET {}"
 msgstr ""
 
-#: awx/api/views.py:2132
+#: awx/api/views.py:2355
 msgid ""
 "Unauthorized access. Please check your Insights Credential username and "
 "password."
 msgstr ""
 
-#: awx/api/views.py:2134
+#: awx/api/views.py:2358
 msgid ""
 "Failed to gather reports and maintenance plans from Insights API at URL {}. "
 "Server responded with {} status code and message {}"
 msgstr ""
 
-#: awx/api/views.py:2140
+#: awx/api/views.py:2365
 msgid "Expected JSON response from Insights but instead got {}"
 msgstr ""
 
-#: awx/api/views.py:2147
+#: awx/api/views.py:2372
 msgid "This host is not recognized as an Insights host."
 msgstr ""
 
-#: awx/api/views.py:2152
+#: awx/api/views.py:2377
 msgid "The Insights Credential for \"{}\" was not found."
 msgstr ""
 
-#: awx/api/views.py:2221
+#: awx/api/views.py:2445
 msgid "Cyclical Group association."
 msgstr ""
 
-#: awx/api/views.py:2499
+#: awx/api/views.py:2658
 msgid "Inventory Source List"
 msgstr ""
 
-#: awx/api/views.py:2512
+#: awx/api/views.py:2670
 msgid "Inventory Sources Update"
 msgstr ""
 
-#: awx/api/views.py:2542
+#: awx/api/views.py:2703
 msgid "Could not start because `can_update` returned False"
 msgstr ""
 
-#: awx/api/views.py:2550
+#: awx/api/views.py:2711
 msgid "No inventory sources to update."
 msgstr ""
 
-#: awx/api/views.py:2582
-msgid "Cannot delete inventory source."
-msgstr ""
-
-#: awx/api/views.py:2590
+#: awx/api/views.py:2740
 msgid "Inventory Source Schedules"
 msgstr ""
 
-#: awx/api/views.py:2620
+#: awx/api/views.py:2767
 msgid "Notification Templates can only be assigned when source is one of {}."
 msgstr ""
 
-#: awx/api/views.py:2851
+#: awx/api/views.py:2822
+msgid "Vault credentials are not yet supported for inventory sources."
+msgstr ""
+
+#: awx/api/views.py:2827
+msgid "Source already has cloud credential assigned."
+msgstr ""
+
+#: awx/api/views.py:2986
+msgid ""
+"'credentials' cannot be used in combination with 'credential', "
+"'vault_credential', or 'extra_credentials'."
+msgstr ""
+
+#: awx/api/views.py:3098
 msgid "Job Template Schedules"
 msgstr ""
 
-#: awx/api/views.py:2871 awx/api/views.py:2882
+#: awx/api/views.py:3116 awx/api/views.py:3127
 msgid "Your license does not allow adding surveys."
 msgstr ""
 
-#: awx/api/views.py:2889
-msgid "'name' missing from survey spec."
+#: awx/api/views.py:3146
+msgid "Field '{}' is missing from survey spec."
 msgstr ""
 
-#: awx/api/views.py:2891
-msgid "'description' missing from survey spec."
+#: awx/api/views.py:3148
+msgid "Expected {} for field '{}', received {} type."
 msgstr ""
 
-#: awx/api/views.py:2893
-msgid "'spec' missing from survey spec."
-msgstr ""
-
-#: awx/api/views.py:2895
-msgid "'spec' must be a list of items."
-msgstr ""
-
-#: awx/api/views.py:2897
+#: awx/api/views.py:3152
 msgid "'spec' doesn't contain any items."
 msgstr ""
 
-#: awx/api/views.py:2903
+#: awx/api/views.py:3161
 #, python-format
 msgid "Survey question %s is not a json object."
 msgstr ""
 
-#: awx/api/views.py:2905
+#: awx/api/views.py:3163
 #, python-format
 msgid "'type' missing from survey question %s."
 msgstr ""
 
-#: awx/api/views.py:2907
+#: awx/api/views.py:3165
 #, python-format
 msgid "'question_name' missing from survey question %s."
 msgstr ""
 
-#: awx/api/views.py:2909
+#: awx/api/views.py:3167
 #, python-format
 msgid "'variable' missing from survey question %s."
 msgstr ""
 
-#: awx/api/views.py:2911
+#: awx/api/views.py:3169
 #, python-format
 msgid "'variable' '%(item)s' duplicated in survey question %(survey)s."
 msgstr ""
 
-#: awx/api/views.py:2916
+#: awx/api/views.py:3174
 #, python-format
 msgid "'required' missing from survey question %s."
 msgstr ""
 
-#: awx/api/views.py:2921
+#: awx/api/views.py:3179
 #, python-brace-format
 msgid "Value {question_default} for '{variable_name}' expected to be a string."
 msgstr ""
 
-#: awx/api/views.py:2928
+#: awx/api/views.py:3189
 #, python-brace-format
 msgid ""
-"$encrypted$ is reserved keyword for password questions and may not be used "
-"as a default for '{variable_name}' in survey question {question_position}."
+"$encrypted$ is a reserved keyword for password question defaults, survey "
+"question {question_position} is type {question_type}."
 msgstr ""
 
-#: awx/api/views.py:3049
+#: awx/api/views.py:3205
+#, python-brace-format
+msgid ""
+"$encrypted$ is a reserved keyword, may not be used for new default in "
+"position {question_position}."
+msgstr ""
+
+#: awx/api/views.py:3278
+#, python-brace-format
+msgid "Cannot assign multiple {credential_type} credentials."
+msgstr ""
+
+#: awx/api/views.py:3296
+msgid "Extra credentials must be network or cloud."
+msgstr ""
+
+#: awx/api/views.py:3318
 msgid "Maximum number of labels for {} reached."
 msgstr ""
 
-#: awx/api/views.py:3170
+#: awx/api/views.py:3441
 msgid "No matching host could be found!"
 msgstr ""
 
-#: awx/api/views.py:3173
+#: awx/api/views.py:3444
 msgid "Multiple hosts matched the request!"
 msgstr ""
 
-#: awx/api/views.py:3178
+#: awx/api/views.py:3449
 msgid "Cannot start automatically, user input required!"
 msgstr ""
 
-#: awx/api/views.py:3185
+#: awx/api/views.py:3456
 msgid "Host callback job already pending."
 msgstr ""
 
-#: awx/api/views.py:3199
+#: awx/api/views.py:3471 awx/api/views.py:4212
 msgid "Error starting job!"
 msgstr ""
 
-#: awx/api/views.py:3306
+#: awx/api/views.py:3587
 #, python-brace-format
 msgid "Cannot associate {0} when {1} have been associated."
 msgstr ""
 
-#: awx/api/views.py:3331
+#: awx/api/views.py:3612
 msgid "Multiple parent relationship not allowed."
 msgstr ""
 
-#: awx/api/views.py:3336
+#: awx/api/views.py:3617
 msgid "Cycle detected."
 msgstr ""
 
-#: awx/api/views.py:3540
+#: awx/api/views.py:3807
 msgid "Workflow Job Template Schedules"
 msgstr ""
 
-#: awx/api/views.py:3685 awx/api/views.py:4268
+#: awx/api/views.py:3938 awx/api/views.py:4610
 msgid "Superuser privileges needed."
 msgstr ""
 
-#: awx/api/views.py:3717
+#: awx/api/views.py:3970
 msgid "System Job Template Schedules"
 msgstr ""
 
-#: awx/api/views.py:3780
+#: awx/api/views.py:4028
 msgid "POST not allowed for Job launching in version 2 of the api"
 msgstr ""
 
-#: awx/api/views.py:3942
+#: awx/api/views.py:4195
+#, python-brace-format
+msgid "Wait until job finishes before retrying on {status_value} hosts."
+msgstr ""
+
+#: awx/api/views.py:4200
+#, python-brace-format
+msgid "Cannot retry on {status_value} hosts, playbook stats not available."
+msgstr ""
+
+#: awx/api/views.py:4205
+#, python-brace-format
+msgid "Cannot relaunch because previous job had 0 {status_value} hosts."
+msgstr ""
+
+#: awx/api/views.py:4234
+msgid "Cannot create schedule because job requires credential passwords."
+msgstr ""
+
+#: awx/api/views.py:4239
+msgid "Cannot create schedule because job was launched by legacy method."
+msgstr ""
+
+#: awx/api/views.py:4241
+msgid "Cannot create schedule because a related resource is missing."
+msgstr ""
+
+#: awx/api/views.py:4295
 msgid "Job Host Summaries List"
 msgstr ""
 
-#: awx/api/views.py:3989
+#: awx/api/views.py:4342
 msgid "Job Event Children List"
 msgstr ""
 
-#: awx/api/views.py:3998
+#: awx/api/views.py:4351
 msgid "Job Event Hosts List"
 msgstr ""
 
-#: awx/api/views.py:4008
+#: awx/api/views.py:4360
 msgid "Job Events List"
 msgstr ""
 
-#: awx/api/views.py:4222
+#: awx/api/views.py:4570
 msgid "Ad Hoc Command Events List"
 msgstr ""
 
-#: awx/api/views.py:4437
-msgid "Error generating stdout download file: {}"
-msgstr ""
-
-#: awx/api/views.py:4450
-#, python-format
-msgid "Error generating stdout download file: %s"
-msgstr ""
-
-#: awx/api/views.py:4495
+#: awx/api/views.py:4809
 msgid "Delete not allowed while there are pending notifications"
 msgstr ""
 
-#: awx/api/views.py:4502
+#: awx/api/views.py:4817
 msgid "Notification Template Test"
 msgstr ""
 
@@ -1158,19 +1360,31 @@ msgstr ""
 msgid "Example setting which can be different for each user."
 msgstr ""
 
-#: awx/conf/conf.py:95 awx/conf/registry.py:85 awx/conf/views.py:56
+#: awx/conf/conf.py:95 awx/conf/registry.py:85 awx/conf/views.py:55
 msgid "User"
 msgstr ""
 
-#: awx/conf/fields.py:63
+#: awx/conf/fields.py:60 awx/sso/fields.py:583
+#, python-brace-format
+msgid ""
+"Expected None, True, False, a string or list of strings but got {input_type} "
+"instead."
+msgstr ""
+
+#: awx/conf/fields.py:104
 msgid "Enter a valid URL"
 msgstr ""
 
-#: awx/conf/fields.py:95
+#: awx/conf/fields.py:136
 #, python-brace-format
 msgid "\"{input}\" is not a valid string."
 msgstr ""
 
+#: awx/conf/fields.py:151
+#, python-brace-format
+msgid "Expected a list of tuples of max length 2 but got {input_type} instead."
+msgstr ""
+
 #: awx/conf/license.py:22
 msgid "Your Tower license does not allow that."
 msgstr ""
@@ -1261,9 +1475,9 @@ msgstr ""
 #: awx/conf/tests/unit/test_settings.py:411
 #: awx/conf/tests/unit/test_settings.py:430
 #: awx/conf/tests/unit/test_settings.py:466 awx/main/conf.py:22
-#: awx/main/conf.py:32 awx/main/conf.py:42 awx/main/conf.py:51
-#: awx/main/conf.py:63 awx/main/conf.py:81 awx/main/conf.py:96
-#: awx/main/conf.py:121
+#: awx/main/conf.py:32 awx/main/conf.py:42 awx/main/conf.py:52
+#: awx/main/conf.py:61 awx/main/conf.py:73 awx/main/conf.py:86
+#: awx/main/conf.py:99 awx/main/conf.py:124
 msgid "System"
 msgstr ""
 
@@ -1275,103 +1489,104 @@ msgstr ""
 msgid "OtherSystem"
 msgstr ""
 
-#: awx/conf/views.py:48
+#: awx/conf/views.py:47
 msgid "Setting Categories"
 msgstr ""
 
-#: awx/conf/views.py:73
+#: awx/conf/views.py:71
 msgid "Setting Detail"
 msgstr ""
 
-#: awx/conf/views.py:168
+#: awx/conf/views.py:166
 msgid "Logging Connectivity Test"
 msgstr ""
 
-#: awx/main/access.py:44
-msgid "Resource is being used by running jobs."
+#: awx/main/access.py:57
+#, python-format
+msgid "Required related field %s for permission check."
 msgstr ""
 
-#: awx/main/access.py:237
+#: awx/main/access.py:73
 #, python-format
 msgid "Bad data found in related field %s."
 msgstr ""
 
-#: awx/main/access.py:281
+#: awx/main/access.py:293
 msgid "License is missing."
 msgstr ""
 
-#: awx/main/access.py:283
+#: awx/main/access.py:295
 msgid "License has expired."
 msgstr ""
 
-#: awx/main/access.py:291
+#: awx/main/access.py:303
 #, python-format
 msgid "License count of %s instances has been reached."
 msgstr ""
 
-#: awx/main/access.py:293
+#: awx/main/access.py:305
 #, python-format
 msgid "License count of %s instances has been exceeded."
 msgstr ""
 
-#: awx/main/access.py:295
+#: awx/main/access.py:307
 msgid "Host count exceeds available instances."
 msgstr ""
 
-#: awx/main/access.py:299
+#: awx/main/access.py:311
 #, python-format
 msgid "Feature %s is not enabled in the active license."
 msgstr ""
 
-#: awx/main/access.py:301
+#: awx/main/access.py:313
 msgid "Features not found in active license."
 msgstr ""
 
-#: awx/main/access.py:707
+#: awx/main/access.py:823
 msgid "Unable to change inventory on a host."
 msgstr ""
 
-#: awx/main/access.py:724 awx/main/access.py:769
+#: awx/main/access.py:840 awx/main/access.py:885
 msgid "Cannot associate two items from different inventories."
 msgstr ""
 
-#: awx/main/access.py:757
+#: awx/main/access.py:873
 msgid "Unable to change inventory on a group."
 msgstr ""
 
-#: awx/main/access.py:1017
+#: awx/main/access.py:1131
 msgid "Unable to change organization on a team."
 msgstr ""
 
-#: awx/main/access.py:1030
+#: awx/main/access.py:1148
 msgid "The {} role cannot be assigned to a team"
 msgstr ""
 
-#: awx/main/access.py:1032
+#: awx/main/access.py:1150
 msgid "The admin_role for a User cannot be assigned to a team"
 msgstr ""
 
-#: awx/main/access.py:1479
+#: awx/main/access.py:1517
 msgid "Job has been orphaned from its job template."
 msgstr ""
 
-#: awx/main/access.py:1481
-msgid "You do not have execute permission to related job template."
+#: awx/main/access.py:1519
+msgid "Job was launched with unknown prompted fields."
 msgstr ""
 
-#: awx/main/access.py:1484
+#: awx/main/access.py:1521
 msgid "Job was launched with prompted fields."
 msgstr ""
 
-#: awx/main/access.py:1486
+#: awx/main/access.py:1523
 msgid " Organization level permissions required."
 msgstr ""
 
-#: awx/main/access.py:1488
+#: awx/main/access.py:1525
 msgid " You do not have permission to related resources."
 msgstr ""
 
-#: awx/main/access.py:1833
+#: awx/main/access.py:1935
 msgid ""
 "You do not have permission to the workflow job resources required for "
 "relaunch."
@@ -1410,328 +1625,355 @@ msgid ""
 msgstr ""
 
 #: awx/main/conf.py:49
-msgid "Enable Administrator Alerts"
+msgid "Organization Admins Can Manage Users and Teams"
 msgstr ""
 
 #: awx/main/conf.py:50
-msgid "Email Admin users for system events that may require attention."
+msgid ""
+"Controls whether any Organization Admin has the privileges to create and "
+"manage users and teams. You may want to disable this ability if you are "
+"using an LDAP or SAML integration."
+msgstr ""
+
+#: awx/main/conf.py:59
+msgid "Enable Administrator Alerts"
 msgstr ""
 
 #: awx/main/conf.py:60
+msgid "Email Admin users for system events that may require attention."
+msgstr ""
+
+#: awx/main/conf.py:70
 msgid "Base URL of the Tower host"
 msgstr ""
 
-#: awx/main/conf.py:61
+#: awx/main/conf.py:71
 msgid ""
 "This setting is used by services like notifications to render a valid url to "
 "the Tower host."
 msgstr ""
 
-#: awx/main/conf.py:70
+#: awx/main/conf.py:80
 msgid "Remote Host Headers"
 msgstr ""
 
-#: awx/main/conf.py:71
+#: awx/main/conf.py:81
 msgid ""
 "HTTP headers and meta keys to search to determine remote host name or IP. "
 "Add additional items to this list, such as \"HTTP_X_FORWARDED_FOR\", if "
-"behind a reverse proxy.\n"
-"\n"
-"Note: The headers will be searched in order and the first found remote host "
-"name or IP will be used.\n"
-"\n"
-"In the below example 8.8.8.7 would be the chosen IP address.\n"
-"X-Forwarded-For: 8.8.8.7, 192.168.2.1, 127.0.0.1\n"
-"Host: 127.0.0.1\n"
-"REMOTE_HOST_HEADERS = ['HTTP_X_FORWARDED_FOR', 'REMOTE_ADDR', 'REMOTE_HOST']"
+"behind a reverse proxy. See the \"Proxy Support\" section of the "
+"Adminstrator guide formore details."
 msgstr ""
 
-#: awx/main/conf.py:88
+#: awx/main/conf.py:93
 msgid "Proxy IP Whitelist"
 msgstr ""
 
-#: awx/main/conf.py:89
+#: awx/main/conf.py:94
 msgid ""
 "If Tower is behind a reverse proxy/load balancer, use this setting to "
 "whitelist the proxy IP addresses from which Tower should trust custom "
-"REMOTE_HOST_HEADERS header values\n"
-"REMOTE_HOST_HEADERS = ['HTTP_X_FORWARDED_FOR', ''REMOTE_ADDR', "
-"'REMOTE_HOST']\n"
-"PROXY_IP_WHITELIST = ['10.0.1.100', '10.0.1.101']\n"
-"If this setting is an empty list (the default), the headers specified by "
-"REMOTE_HOST_HEADERS will be trusted unconditionally')"
+"REMOTE_HOST_HEADERS header values. If this setting is an empty list (the "
+"default), the headers specified by REMOTE_HOST_HEADERS will be trusted "
+"unconditionally')"
 msgstr ""
 
-#: awx/main/conf.py:117
+#: awx/main/conf.py:120
 msgid "License"
 msgstr ""
 
-#: awx/main/conf.py:118
+#: awx/main/conf.py:121
 msgid ""
 "The license controls which features and functionality are enabled. Use /api/"
 "v1/config/ to update or change the license."
 msgstr ""
 
-#: awx/main/conf.py:128
+#: awx/main/conf.py:131
 msgid "Ansible Modules Allowed for Ad Hoc Jobs"
 msgstr ""
 
-#: awx/main/conf.py:129
+#: awx/main/conf.py:132
 msgid "List of modules allowed to be used by ad-hoc jobs."
 msgstr ""
 
-#: awx/main/conf.py:130 awx/main/conf.py:140 awx/main/conf.py:151
-#: awx/main/conf.py:161 awx/main/conf.py:171 awx/main/conf.py:181
-#: awx/main/conf.py:192 awx/main/conf.py:204 awx/main/conf.py:216
-#: awx/main/conf.py:229 awx/main/conf.py:241 awx/main/conf.py:251
-#: awx/main/conf.py:262 awx/main/conf.py:272 awx/main/conf.py:282
-#: awx/main/conf.py:292 awx/main/conf.py:304 awx/main/conf.py:316
-#: awx/main/conf.py:328 awx/main/conf.py:341
+#: awx/main/conf.py:133 awx/main/conf.py:155 awx/main/conf.py:164
+#: awx/main/conf.py:175 awx/main/conf.py:185 awx/main/conf.py:195
+#: awx/main/conf.py:205 awx/main/conf.py:216 awx/main/conf.py:228
+#: awx/main/conf.py:240 awx/main/conf.py:253 awx/main/conf.py:265
+#: awx/main/conf.py:275 awx/main/conf.py:286 awx/main/conf.py:297
+#: awx/main/conf.py:307 awx/main/conf.py:317 awx/main/conf.py:329
+#: awx/main/conf.py:341 awx/main/conf.py:353 awx/main/conf.py:367
 msgid "Jobs"
 msgstr ""
 
-#: awx/main/conf.py:138
+#: awx/main/conf.py:142
+msgid "Always"
+msgstr ""
+
+#: awx/main/conf.py:143
+msgid "Never"
+msgstr ""
+
+#: awx/main/conf.py:144
+msgid "Only On Job Template Definitions"
+msgstr ""
+
+#: awx/main/conf.py:147
+msgid "When can extra variables contain Jinja templates?"
+msgstr ""
+
+#: awx/main/conf.py:149
+msgid ""
+"Ansible allows variable substitution via the Jinja2 templating language for "
+"--extra-vars. This poses a potential security risk where Tower users with "
+"the ability to specify extra vars at job launch time can use Jinja2 "
+"templates to run arbitrary Python.  It is recommended that this value be set "
+"to \"template\" or \"never\"."
+msgstr ""
+
+#: awx/main/conf.py:162
 msgid "Enable job isolation"
 msgstr ""
 
-#: awx/main/conf.py:139
+#: awx/main/conf.py:163
 msgid ""
 "Isolates an Ansible job from protected parts of the system to prevent "
 "exposing sensitive information."
 msgstr ""
 
-#: awx/main/conf.py:147
+#: awx/main/conf.py:171
 msgid "Job execution path"
 msgstr ""
 
-#: awx/main/conf.py:148
+#: awx/main/conf.py:172
 msgid ""
 "The directory in which Tower will create new temporary directories for job "
 "execution and isolation (such as credential files and custom inventory "
 "scripts)."
 msgstr ""
 
-#: awx/main/conf.py:159
+#: awx/main/conf.py:183
 msgid "Paths to hide from isolated jobs"
 msgstr ""
 
-#: awx/main/conf.py:160
+#: awx/main/conf.py:184
 msgid ""
 "Additional paths to hide from isolated processes. Enter one path per line."
 msgstr ""
 
-#: awx/main/conf.py:169
+#: awx/main/conf.py:193
 msgid "Paths to expose to isolated jobs"
 msgstr ""
 
-#: awx/main/conf.py:170
+#: awx/main/conf.py:194
 msgid ""
 "Whitelist of paths that would otherwise be hidden to expose to isolated "
 "jobs. Enter one path per line."
 msgstr ""
 
-#: awx/main/conf.py:179
+#: awx/main/conf.py:203
 msgid "Isolated status check interval"
 msgstr ""
 
-#: awx/main/conf.py:180
+#: awx/main/conf.py:204
 msgid ""
 "The number of seconds to sleep between status checks for jobs running on "
 "isolated instances."
 msgstr ""
 
-#: awx/main/conf.py:189
+#: awx/main/conf.py:213
 msgid "Isolated launch timeout"
 msgstr ""
 
-#: awx/main/conf.py:190
+#: awx/main/conf.py:214
 msgid ""
 "The timeout (in seconds) for launching jobs on isolated instances.  This "
 "includes the time needed to copy source control files (playbooks) to the "
 "isolated instance."
 msgstr ""
 
-#: awx/main/conf.py:201
+#: awx/main/conf.py:225
 msgid "Isolated connection timeout"
 msgstr ""
 
-#: awx/main/conf.py:202
+#: awx/main/conf.py:226
 msgid ""
 "Ansible SSH connection timeout (in seconds) to use when communicating with "
 "isolated instances. Value should be substantially greater than expected "
 "network latency."
 msgstr ""
 
-#: awx/main/conf.py:212
+#: awx/main/conf.py:236
 msgid "Generate RSA keys for isolated instances"
 msgstr ""
 
-#: awx/main/conf.py:213
+#: awx/main/conf.py:237
 msgid ""
 "If set, a random RSA key will be generated and distributed to isolated "
 "instances.  To disable this behavior and manage authentication for isolated "
 "instances outside of Tower, disable this setting."
 msgstr ""
 
-#: awx/main/conf.py:227 awx/main/conf.py:228
+#: awx/main/conf.py:251 awx/main/conf.py:252
 msgid "The RSA private key for SSH traffic to isolated instances"
 msgstr ""
 
-#: awx/main/conf.py:239 awx/main/conf.py:240
+#: awx/main/conf.py:263 awx/main/conf.py:264
 msgid "The RSA public key for SSH traffic to isolated instances"
 msgstr ""
 
-#: awx/main/conf.py:249
+#: awx/main/conf.py:273
 msgid "Extra Environment Variables"
 msgstr ""
 
-#: awx/main/conf.py:250
+#: awx/main/conf.py:274
 msgid ""
 "Additional environment variables set for playbook runs, inventory updates, "
 "project updates, and notification sending."
 msgstr ""
 
-#: awx/main/conf.py:260
+#: awx/main/conf.py:284
 msgid "Standard Output Maximum Display Size"
 msgstr ""
 
-#: awx/main/conf.py:261
+#: awx/main/conf.py:285
 msgid ""
 "Maximum Size of Standard Output in bytes to display before requiring the "
 "output be downloaded."
 msgstr ""
 
-#: awx/main/conf.py:270
+#: awx/main/conf.py:294
 msgid "Job Event Standard Output Maximum Display Size"
 msgstr ""
 
-#: awx/main/conf.py:271
+#: awx/main/conf.py:296
 msgid ""
 "Maximum Size of Standard Output in bytes to display for a single job or ad "
 "hoc command event. `stdout` will end with `…` when truncated."
 msgstr ""
 
-#: awx/main/conf.py:280
+#: awx/main/conf.py:305
 msgid "Maximum Scheduled Jobs"
 msgstr ""
 
-#: awx/main/conf.py:281
+#: awx/main/conf.py:306
 msgid ""
 "Maximum number of the same job template that can be waiting to run when "
 "launching from a schedule before no more are created."
 msgstr ""
 
-#: awx/main/conf.py:290
+#: awx/main/conf.py:315
 msgid "Ansible Callback Plugins"
 msgstr ""
 
-#: awx/main/conf.py:291
+#: awx/main/conf.py:316
 msgid ""
 "List of paths to search for extra callback plugins to be used when running "
 "jobs. Enter one path per line."
 msgstr ""
 
-#: awx/main/conf.py:301
+#: awx/main/conf.py:326
 msgid "Default Job Timeout"
 msgstr ""
 
-#: awx/main/conf.py:302
+#: awx/main/conf.py:327
 msgid ""
 "Maximum time in seconds to allow jobs to run. Use value of 0 to indicate "
 "that no timeout should be imposed. A timeout set on an individual job "
 "template will override this."
 msgstr ""
 
-#: awx/main/conf.py:313
+#: awx/main/conf.py:338
 msgid "Default Inventory Update Timeout"
 msgstr ""
 
-#: awx/main/conf.py:314
+#: awx/main/conf.py:339
 msgid ""
 "Maximum time in seconds to allow inventory updates to run. Use value of 0 to "
 "indicate that no timeout should be imposed. A timeout set on an individual "
 "inventory source will override this."
 msgstr ""
 
-#: awx/main/conf.py:325
+#: awx/main/conf.py:350
 msgid "Default Project Update Timeout"
 msgstr ""
 
-#: awx/main/conf.py:326
+#: awx/main/conf.py:351
 msgid ""
 "Maximum time in seconds to allow project updates to run. Use value of 0 to "
 "indicate that no timeout should be imposed. A timeout set on an individual "
 "project will override this."
 msgstr ""
 
-#: awx/main/conf.py:337
+#: awx/main/conf.py:362
 msgid "Per-Host Ansible Fact Cache Timeout"
 msgstr ""
 
-#: awx/main/conf.py:338
+#: awx/main/conf.py:363
 msgid ""
 "Maximum time, in seconds, that stored Ansible facts are considered valid "
 "since the last time they were modified. Only valid, non-stale, facts will be "
 "accessible by a playbook. Note, this does not influence the deletion of "
-"ansible_facts from the database."
+"ansible_facts from the database. Use a value of 0 to indicate that no "
+"timeout should be imposed."
 msgstr ""
 
-#: awx/main/conf.py:350
+#: awx/main/conf.py:376
 msgid "Logging Aggregator"
 msgstr ""
 
-#: awx/main/conf.py:351
+#: awx/main/conf.py:377
 msgid "Hostname/IP where external logs will be sent to."
 msgstr ""
 
-#: awx/main/conf.py:352 awx/main/conf.py:363 awx/main/conf.py:375
-#: awx/main/conf.py:385 awx/main/conf.py:397 awx/main/conf.py:412
-#: awx/main/conf.py:424 awx/main/conf.py:433 awx/main/conf.py:443
-#: awx/main/conf.py:453 awx/main/conf.py:464 awx/main/conf.py:476
-#: awx/main/conf.py:489
+#: awx/main/conf.py:378 awx/main/conf.py:389 awx/main/conf.py:401
+#: awx/main/conf.py:411 awx/main/conf.py:423 awx/main/conf.py:438
+#: awx/main/conf.py:450 awx/main/conf.py:459 awx/main/conf.py:469
+#: awx/main/conf.py:479 awx/main/conf.py:490 awx/main/conf.py:502
+#: awx/main/conf.py:515
 msgid "Logging"
 msgstr ""
 
-#: awx/main/conf.py:360
+#: awx/main/conf.py:386
 msgid "Logging Aggregator Port"
 msgstr ""
 
-#: awx/main/conf.py:361
+#: awx/main/conf.py:387
 msgid ""
 "Port on Logging Aggregator to send logs to (if required and not provided in "
 "Logging Aggregator)."
 msgstr ""
 
-#: awx/main/conf.py:373
+#: awx/main/conf.py:399
 msgid "Logging Aggregator Type"
 msgstr ""
 
-#: awx/main/conf.py:374
+#: awx/main/conf.py:400
 msgid "Format messages for the chosen log aggregator."
 msgstr ""
 
-#: awx/main/conf.py:383
+#: awx/main/conf.py:409
 msgid "Logging Aggregator Username"
 msgstr ""
 
-#: awx/main/conf.py:384
+#: awx/main/conf.py:410
 msgid "Username for external log aggregator (if required)."
 msgstr ""
 
-#: awx/main/conf.py:395
+#: awx/main/conf.py:421
 msgid "Logging Aggregator Password/Token"
 msgstr ""
 
-#: awx/main/conf.py:396
+#: awx/main/conf.py:422
 msgid ""
 "Password or authentication token for external log aggregator (if required)."
 msgstr ""
 
-#: awx/main/conf.py:405
+#: awx/main/conf.py:431
 msgid "Loggers Sending Data to Log Aggregator Form"
 msgstr ""
 
-#: awx/main/conf.py:406
+#: awx/main/conf.py:432
 msgid ""
 "List of loggers that will send HTTP logs to the collector, these can include "
 "any or all of: \n"
@@ -1741,57 +1983,57 @@ msgid ""
 "system_tracking - facts gathered from scan jobs."
 msgstr ""
 
-#: awx/main/conf.py:419
+#: awx/main/conf.py:445
 msgid "Log System Tracking Facts Individually"
 msgstr ""
 
-#: awx/main/conf.py:420
+#: awx/main/conf.py:446
 msgid ""
-"If set, system tracking facts will be sent for each package, service, "
-"orother item found in a scan, allowing for greater search query granularity. "
+"If set, system tracking facts will be sent for each package, service, or "
+"other item found in a scan, allowing for greater search query granularity. "
 "If unset, facts will be sent as a single dictionary, allowing for greater "
 "efficiency in fact processing."
 msgstr ""
 
-#: awx/main/conf.py:431
+#: awx/main/conf.py:457
 msgid "Enable External Logging"
 msgstr ""
 
-#: awx/main/conf.py:432
+#: awx/main/conf.py:458
 msgid "Enable sending logs to external log aggregator."
 msgstr ""
 
-#: awx/main/conf.py:441
+#: awx/main/conf.py:467
 msgid "Cluster-wide Tower unique identifier."
 msgstr ""
 
-#: awx/main/conf.py:442
+#: awx/main/conf.py:468
 msgid "Useful to uniquely identify Tower instances."
 msgstr ""
 
-#: awx/main/conf.py:451
+#: awx/main/conf.py:477
 msgid "Logging Aggregator Protocol"
 msgstr ""
 
-#: awx/main/conf.py:452
+#: awx/main/conf.py:478
 msgid "Protocol used to communicate with log aggregator."
 msgstr ""
 
-#: awx/main/conf.py:460
+#: awx/main/conf.py:486
 msgid "TCP Connection Timeout"
 msgstr ""
 
-#: awx/main/conf.py:461
+#: awx/main/conf.py:487
 msgid ""
 "Number of seconds for a TCP connection to external log aggregator to "
 "timeout. Applies to HTTPS and TCP log aggregator protocols."
 msgstr ""
 
-#: awx/main/conf.py:471
+#: awx/main/conf.py:497
 msgid "Enable/disable HTTPS certificate verification"
 msgstr ""
 
-#: awx/main/conf.py:472
+#: awx/main/conf.py:498
 msgid ""
 "Flag to control enable/disable of certificate verification when "
 "LOG_AGGREGATOR_PROTOCOL is \"https\". If enabled, Tower's log handler will "
@@ -1799,11 +2041,11 @@ msgid ""
 "connection."
 msgstr ""
 
-#: awx/main/conf.py:484
+#: awx/main/conf.py:510
 msgid "Logging Aggregator Level Threshold"
 msgstr ""
 
-#: awx/main/conf.py:485
+#: awx/main/conf.py:511
 msgid ""
 "Level threshold used by log handler. Severities from lowest to highest are "
 "DEBUG, INFO, WARNING, ERROR, CRITICAL. Messages less severe than the "
@@ -1811,133 +2053,182 @@ msgid ""
 "anlytics ignore this setting)"
 msgstr ""
 
-#: awx/main/conf.py:508 awx/sso/conf.py:1105
+#: awx/main/conf.py:534 awx/sso/conf.py:1262
 msgid "\n"
 msgstr ""
 
-#: awx/main/constants.py:10
+#: awx/main/constants.py:17
 msgid "Sudo"
 msgstr ""
 
-#: awx/main/constants.py:10
+#: awx/main/constants.py:17
 msgid "Su"
 msgstr ""
 
-#: awx/main/constants.py:10
+#: awx/main/constants.py:17
 msgid "Pbrun"
 msgstr ""
 
-#: awx/main/constants.py:10
+#: awx/main/constants.py:17
 msgid "Pfexec"
 msgstr ""
 
-#: awx/main/constants.py:10
+#: awx/main/constants.py:18
 msgid "DZDO"
 msgstr ""
 
-#: awx/main/constants.py:10
+#: awx/main/constants.py:18
 msgid "Pmrun"
 msgstr ""
 
-#: awx/main/constants.py:10
+#: awx/main/constants.py:18
 msgid "Runas"
 msgstr ""
 
-#: awx/main/fields.py:57
-#, python-format
-msgid "'%s' is not one of ['%s']"
+#: awx/main/constants.py:19
+msgid "Enable"
 msgstr ""
 
-#: awx/main/fields.py:533
+#: awx/main/constants.py:19
+msgid "Doas"
+msgstr ""
+
+#: awx/main/constants.py:21
+msgid "None"
+msgstr ""
+
+#: awx/main/fields.py:62
+#, python-brace-format
+msgid "'{value}' is not one of ['{allowed_values}']"
+msgstr ""
+
+#: awx/main/fields.py:418
+#, python-brace-format
+msgid "{type} provided in relative path {path}, expected {expected_type}"
+msgstr ""
+
+#: awx/main/fields.py:423
+#, python-brace-format
+msgid "{type} provided, expected {expected_type}"
+msgstr ""
+
+#: awx/main/fields.py:428
+#, python-brace-format
+msgid "Schema validation error in relative path {path} ({error})"
+msgstr ""
+
+#: awx/main/fields.py:549
+msgid "secret values must be of type string, not {}"
+msgstr ""
+
+#: awx/main/fields.py:584
 #, python-format
 msgid "cannot be set unless \"%s\" is set"
 msgstr ""
 
-#: awx/main/fields.py:549
+#: awx/main/fields.py:600
 #, python-format
 msgid "required for %s"
 msgstr ""
 
-#: awx/main/fields.py:573
+#: awx/main/fields.py:624
 msgid "must be set when SSH key is encrypted."
 msgstr ""
 
-#: awx/main/fields.py:579
+#: awx/main/fields.py:630
 msgid "should not be set when SSH key is not encrypted."
 msgstr ""
 
-#: awx/main/fields.py:637
+#: awx/main/fields.py:688
 msgid "'dependencies' is not supported for custom credentials."
 msgstr ""
 
-#: awx/main/fields.py:651
+#: awx/main/fields.py:702
 msgid "\"tower\" is a reserved field name"
 msgstr ""
 
-#: awx/main/fields.py:658
+#: awx/main/fields.py:709
 #, python-format
 msgid "field IDs must be unique (%s)"
 msgstr ""
 
-#: awx/main/fields.py:671
-#, python-format
-msgid "%s not allowed for %s type (%s)"
+#: awx/main/fields.py:722
+msgid "become_method is a reserved type name"
 msgstr ""
 
-#: awx/main/fields.py:755
-#, python-format
-msgid "%s uses an undefined field (%s)"
+#: awx/main/fields.py:733
+#, python-brace-format
+msgid "{sub_key} not allowed for {element_type} type ({element_id})"
 msgstr ""
 
-#: awx/main/middleware.py:157
+#: awx/main/fields.py:813
+msgid "Must use multi-file syntax when injecting multiple files"
+msgstr ""
+
+#: awx/main/fields.py:831
+#, python-brace-format
+msgid "{sub_key} uses an undefined field ({error_msg})"
+msgstr ""
+
+#: awx/main/fields.py:838
+#, python-brace-format
+msgid ""
+"Syntax error rendering template for {sub_key} inside of {type} ({error_msg})"
+msgstr ""
+
+#: awx/main/middleware.py:146
 msgid "Formats of all available named urls"
 msgstr ""
 
-#: awx/main/middleware.py:158
+#: awx/main/middleware.py:147
 msgid ""
 "Read-only list of key-value pairs that shows the standard format of all "
 "available named URLs."
 msgstr ""
 
-#: awx/main/middleware.py:160 awx/main/middleware.py:170
+#: awx/main/middleware.py:149 awx/main/middleware.py:159
 msgid "Named URL"
 msgstr ""
 
-#: awx/main/middleware.py:167
+#: awx/main/middleware.py:156
 msgid "List of all named url graph nodes."
 msgstr ""
 
-#: awx/main/middleware.py:168
+#: awx/main/middleware.py:157
 msgid ""
 "Read-only list of key-value pairs that exposes named URL graph topology. Use "
 "this list to programmatically generate named URLs for resources"
 msgstr ""
 
-#: awx/main/migrations/_reencrypt.py:25 awx/main/models/notifications.py:33
+#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:35
 msgid "Email"
 msgstr ""
 
-#: awx/main/migrations/_reencrypt.py:26 awx/main/models/notifications.py:34
+#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:36
 msgid "Slack"
 msgstr ""
 
-#: awx/main/migrations/_reencrypt.py:27 awx/main/models/notifications.py:35
+#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:37
 msgid "Twilio"
 msgstr ""
 
-#: awx/main/migrations/_reencrypt.py:28 awx/main/models/notifications.py:36
+#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:38
 msgid "Pagerduty"
 msgstr ""
 
-#: awx/main/migrations/_reencrypt.py:29 awx/main/models/notifications.py:37
+#: awx/main/migrations/_reencrypt.py:30 awx/main/models/notifications.py:39
 msgid "HipChat"
 msgstr ""
 
-#: awx/main/migrations/_reencrypt.py:30 awx/main/models/notifications.py:38
+#: awx/main/migrations/_reencrypt.py:31 awx/main/models/notifications.py:41
+msgid "Mattermost"
+msgstr ""
+
+#: awx/main/migrations/_reencrypt.py:32 awx/main/models/notifications.py:40
 msgid "Webhook"
 msgstr ""
 
-#: awx/main/migrations/_reencrypt.py:31 awx/main/models/notifications.py:39
+#: awx/main/migrations/_reencrypt.py:33 awx/main/models/notifications.py:43
 msgid "IRC"
 msgstr ""
 
@@ -1961,244 +2252,325 @@ msgstr ""
 msgid "Entity was Disassociated with another Entity"
 msgstr ""
 
-#: awx/main/models/ad_hoc_commands.py:100
+#: awx/main/models/ad_hoc_commands.py:95
 msgid "No valid inventory."
 msgstr ""
 
-#: awx/main/models/ad_hoc_commands.py:107
+#: awx/main/models/ad_hoc_commands.py:102
 msgid "You must provide a machine / SSH credential."
 msgstr ""
 
-#: awx/main/models/ad_hoc_commands.py:118
-#: awx/main/models/ad_hoc_commands.py:126
+#: awx/main/models/ad_hoc_commands.py:113
+#: awx/main/models/ad_hoc_commands.py:121
 msgid "Invalid type for ad hoc command"
 msgstr ""
 
-#: awx/main/models/ad_hoc_commands.py:121
+#: awx/main/models/ad_hoc_commands.py:116
 msgid "Unsupported module for ad hoc commands."
 msgstr ""
 
-#: awx/main/models/ad_hoc_commands.py:129
+#: awx/main/models/ad_hoc_commands.py:124
 #, python-format
 msgid "No argument passed to %s module."
 msgstr ""
 
-#: awx/main/models/ad_hoc_commands.py:245 awx/main/models/jobs.py:911
-msgid "Host Failed"
-msgstr ""
-
-#: awx/main/models/ad_hoc_commands.py:246 awx/main/models/jobs.py:912
-msgid "Host OK"
-msgstr ""
-
-#: awx/main/models/ad_hoc_commands.py:247 awx/main/models/jobs.py:915
-msgid "Host Unreachable"
-msgstr ""
-
-#: awx/main/models/ad_hoc_commands.py:252 awx/main/models/jobs.py:914
-msgid "Host Skipped"
-msgstr ""
-
-#: awx/main/models/ad_hoc_commands.py:262 awx/main/models/jobs.py:942
-msgid "Debug"
-msgstr ""
-
-#: awx/main/models/ad_hoc_commands.py:263 awx/main/models/jobs.py:943
-msgid "Verbose"
-msgstr ""
-
-#: awx/main/models/ad_hoc_commands.py:264 awx/main/models/jobs.py:944
-msgid "Deprecated"
-msgstr ""
-
-#: awx/main/models/ad_hoc_commands.py:265 awx/main/models/jobs.py:945
-msgid "Warning"
-msgstr ""
-
-#: awx/main/models/ad_hoc_commands.py:266 awx/main/models/jobs.py:946
-msgid "System Warning"
-msgstr ""
-
-#: awx/main/models/ad_hoc_commands.py:267 awx/main/models/jobs.py:947
-#: awx/main/models/unified_jobs.py:64
-msgid "Error"
-msgstr ""
-
-#: awx/main/models/base.py:40 awx/main/models/base.py:46
-#: awx/main/models/base.py:51
+#: awx/main/models/base.py:33 awx/main/models/base.py:39
+#: awx/main/models/base.py:44 awx/main/models/base.py:49
 msgid "Run"
 msgstr ""
 
-#: awx/main/models/base.py:41 awx/main/models/base.py:47
-#: awx/main/models/base.py:52
+#: awx/main/models/base.py:34 awx/main/models/base.py:40
+#: awx/main/models/base.py:45 awx/main/models/base.py:50
 msgid "Check"
 msgstr ""
 
-#: awx/main/models/base.py:42
+#: awx/main/models/base.py:35
 msgid "Scan"
 msgstr ""
 
-#: awx/main/models/credential.py:86
+#: awx/main/models/credential/__init__.py:110
 msgid "Host"
 msgstr ""
 
-#: awx/main/models/credential.py:87
+#: awx/main/models/credential/__init__.py:111
 msgid "The hostname or IP address to use."
 msgstr ""
 
-#: awx/main/models/credential.py:93
+#: awx/main/models/credential/__init__.py:117
 msgid "Username"
 msgstr ""
 
-#: awx/main/models/credential.py:94
+#: awx/main/models/credential/__init__.py:118
 msgid "Username for this credential."
 msgstr ""
 
-#: awx/main/models/credential.py:100
+#: awx/main/models/credential/__init__.py:124
 msgid "Password"
 msgstr ""
 
-#: awx/main/models/credential.py:101
+#: awx/main/models/credential/__init__.py:125
 msgid ""
 "Password for this credential (or \"ASK\" to prompt the user for machine "
 "credentials)."
 msgstr ""
 
-#: awx/main/models/credential.py:108
+#: awx/main/models/credential/__init__.py:132
 msgid "Security Token"
 msgstr ""
 
-#: awx/main/models/credential.py:109
+#: awx/main/models/credential/__init__.py:133
 msgid "Security Token for this credential"
 msgstr ""
 
-#: awx/main/models/credential.py:115
+#: awx/main/models/credential/__init__.py:139
 msgid "Project"
 msgstr ""
 
-#: awx/main/models/credential.py:116
+#: awx/main/models/credential/__init__.py:140
 msgid "The identifier for the project."
 msgstr ""
 
-#: awx/main/models/credential.py:122
+#: awx/main/models/credential/__init__.py:146
 msgid "Domain"
 msgstr ""
 
-#: awx/main/models/credential.py:123
+#: awx/main/models/credential/__init__.py:147
 msgid "The identifier for the domain."
 msgstr ""
 
-#: awx/main/models/credential.py:128
+#: awx/main/models/credential/__init__.py:152
 msgid "SSH private key"
 msgstr ""
 
-#: awx/main/models/credential.py:129
+#: awx/main/models/credential/__init__.py:153
 msgid "RSA or DSA private key to be used instead of password."
 msgstr ""
 
-#: awx/main/models/credential.py:135
+#: awx/main/models/credential/__init__.py:159
 msgid "SSH key unlock"
 msgstr ""
 
-#: awx/main/models/credential.py:136
+#: awx/main/models/credential/__init__.py:160
 msgid ""
 "Passphrase to unlock SSH private key if encrypted (or \"ASK\" to prompt the "
 "user for machine credentials)."
 msgstr ""
 
-#: awx/main/models/credential.py:143
-msgid "None"
-msgstr ""
-
-#: awx/main/models/credential.py:144
+#: awx/main/models/credential/__init__.py:168
 msgid "Privilege escalation method."
 msgstr ""
 
-#: awx/main/models/credential.py:150
+#: awx/main/models/credential/__init__.py:174
 msgid "Privilege escalation username."
 msgstr ""
 
-#: awx/main/models/credential.py:156
+#: awx/main/models/credential/__init__.py:180
 msgid "Password for privilege escalation method."
 msgstr ""
 
-#: awx/main/models/credential.py:162
+#: awx/main/models/credential/__init__.py:186
 msgid "Vault password (or \"ASK\" to prompt the user)."
 msgstr ""
 
-#: awx/main/models/credential.py:166
+#: awx/main/models/credential/__init__.py:190
 msgid "Whether to use the authorize mechanism."
 msgstr ""
 
-#: awx/main/models/credential.py:172
+#: awx/main/models/credential/__init__.py:196
 msgid "Password used by the authorize mechanism."
 msgstr ""
 
-#: awx/main/models/credential.py:178
+#: awx/main/models/credential/__init__.py:202
 msgid "Client Id or Application Id for the credential"
 msgstr ""
 
-#: awx/main/models/credential.py:184
+#: awx/main/models/credential/__init__.py:208
 msgid "Secret Token for this credential"
 msgstr ""
 
-#: awx/main/models/credential.py:190
+#: awx/main/models/credential/__init__.py:214
 msgid "Subscription identifier for this credential"
 msgstr ""
 
-#: awx/main/models/credential.py:196
+#: awx/main/models/credential/__init__.py:220
 msgid "Tenant identifier for this credential"
 msgstr ""
 
-#: awx/main/models/credential.py:220
+#: awx/main/models/credential/__init__.py:244
 msgid ""
 "Specify the type of credential you want to create. Refer to the Ansible "
 "Tower documentation for details on each type."
 msgstr ""
 
-#: awx/main/models/credential.py:234 awx/main/models/credential.py:420
+#: awx/main/models/credential/__init__.py:258
+#: awx/main/models/credential/__init__.py:476
 msgid ""
 "Enter inputs using either JSON or YAML syntax. Use the radio button to "
 "toggle between the two. Refer to the Ansible Tower documentation for example "
 "syntax."
 msgstr ""
 
-#: awx/main/models/credential.py:401
+#: awx/main/models/credential/__init__.py:457
 msgid "Machine"
 msgstr ""
 
-#: awx/main/models/credential.py:402
+#: awx/main/models/credential/__init__.py:458
 msgid "Vault"
 msgstr ""
 
-#: awx/main/models/credential.py:403
+#: awx/main/models/credential/__init__.py:459
 msgid "Network"
 msgstr ""
 
-#: awx/main/models/credential.py:404
+#: awx/main/models/credential/__init__.py:460
 msgid "Source Control"
 msgstr ""
 
-#: awx/main/models/credential.py:405
+#: awx/main/models/credential/__init__.py:461
 msgid "Cloud"
 msgstr ""
 
-#: awx/main/models/credential.py:406
+#: awx/main/models/credential/__init__.py:462
 msgid "Insights"
 msgstr ""
 
-#: awx/main/models/credential.py:427
+#: awx/main/models/credential/__init__.py:483
 msgid ""
 "Enter injectors using either JSON or YAML syntax. Use the radio button to "
 "toggle between the two. Refer to the Ansible Tower documentation for example "
 "syntax."
 msgstr ""
 
-#: awx/main/models/credential.py:478
+#: awx/main/models/credential/__init__.py:534
 #, python-format
 msgid "adding %s credential type"
 msgstr ""
 
+#: awx/main/models/events.py:71 awx/main/models/events.py:598
+msgid "Host Failed"
+msgstr ""
+
+#: awx/main/models/events.py:72 awx/main/models/events.py:599
+msgid "Host OK"
+msgstr ""
+
+#: awx/main/models/events.py:73
+msgid "Host Failure"
+msgstr ""
+
+#: awx/main/models/events.py:74 awx/main/models/events.py:605
+msgid "Host Skipped"
+msgstr ""
+
+#: awx/main/models/events.py:75 awx/main/models/events.py:600
+msgid "Host Unreachable"
+msgstr ""
+
+#: awx/main/models/events.py:76 awx/main/models/events.py:90
+msgid "No Hosts Remaining"
+msgstr ""
+
+#: awx/main/models/events.py:77
+msgid "Host Polling"
+msgstr ""
+
+#: awx/main/models/events.py:78
+msgid "Host Async OK"
+msgstr ""
+
+#: awx/main/models/events.py:79
+msgid "Host Async Failure"
+msgstr ""
+
+#: awx/main/models/events.py:80
+msgid "Item OK"
+msgstr ""
+
+#: awx/main/models/events.py:81
+msgid "Item Failed"
+msgstr ""
+
+#: awx/main/models/events.py:82
+msgid "Item Skipped"
+msgstr ""
+
+#: awx/main/models/events.py:83
+msgid "Host Retry"
+msgstr ""
+
+#: awx/main/models/events.py:85
+msgid "File Difference"
+msgstr ""
+
+#: awx/main/models/events.py:86
+msgid "Playbook Started"
+msgstr ""
+
+#: awx/main/models/events.py:87
+msgid "Running Handlers"
+msgstr ""
+
+#: awx/main/models/events.py:88
+msgid "Including File"
+msgstr ""
+
+#: awx/main/models/events.py:89
+msgid "No Hosts Matched"
+msgstr ""
+
+#: awx/main/models/events.py:91
+msgid "Task Started"
+msgstr ""
+
+#: awx/main/models/events.py:93
+msgid "Variables Prompted"
+msgstr ""
+
+#: awx/main/models/events.py:94
+msgid "Gathering Facts"
+msgstr ""
+
+#: awx/main/models/events.py:95
+msgid "internal: on Import for Host"
+msgstr ""
+
+#: awx/main/models/events.py:96
+msgid "internal: on Not Import for Host"
+msgstr ""
+
+#: awx/main/models/events.py:97
+msgid "Play Started"
+msgstr ""
+
+#: awx/main/models/events.py:98
+msgid "Playbook Complete"
+msgstr ""
+
+#: awx/main/models/events.py:102 awx/main/models/events.py:615
+msgid "Debug"
+msgstr ""
+
+#: awx/main/models/events.py:103 awx/main/models/events.py:616
+msgid "Verbose"
+msgstr ""
+
+#: awx/main/models/events.py:104 awx/main/models/events.py:617
+msgid "Deprecated"
+msgstr ""
+
+#: awx/main/models/events.py:105 awx/main/models/events.py:618
+msgid "Warning"
+msgstr ""
+
+#: awx/main/models/events.py:106 awx/main/models/events.py:619
+msgid "System Warning"
+msgstr ""
+
+#: awx/main/models/events.py:107 awx/main/models/events.py:620
+#: awx/main/models/unified_jobs.py:67
+msgid "Error"
+msgstr ""
+
 #: awx/main/models/fact.py:25
 msgid "Host for the facts that the fact scan captured."
 msgstr ""
@@ -2213,372 +2585,391 @@ msgid ""
 "host."
 msgstr ""
 
-#: awx/main/models/ha.py:78
+#: awx/main/models/ha.py:129
 msgid "Instances that are members of this InstanceGroup"
 msgstr ""
 
-#: awx/main/models/ha.py:83
+#: awx/main/models/ha.py:134
 msgid "Instance Group to remotely control this group."
 msgstr ""
 
-#: awx/main/models/inventory.py:52
+#: awx/main/models/ha.py:141
+msgid "Percentage of Instances to automatically assign to this group"
+msgstr ""
+
+#: awx/main/models/ha.py:145
+msgid ""
+"Static minimum number of Instances to automatically assign to this group"
+msgstr ""
+
+#: awx/main/models/ha.py:150
+msgid ""
+"List of exact-match Instances that will always be automatically assigned to "
+"this group"
+msgstr ""
+
+#: awx/main/models/inventory.py:61
 msgid "Hosts have a direct link to this inventory."
 msgstr ""
 
-#: awx/main/models/inventory.py:53
+#: awx/main/models/inventory.py:62
 msgid "Hosts for inventory generated using the host_filter property."
 msgstr ""
 
-#: awx/main/models/inventory.py:58
+#: awx/main/models/inventory.py:67
 msgid "inventories"
 msgstr ""
 
-#: awx/main/models/inventory.py:65
+#: awx/main/models/inventory.py:74
 msgid "Organization containing this inventory."
 msgstr ""
 
-#: awx/main/models/inventory.py:72
+#: awx/main/models/inventory.py:81
 msgid "Inventory variables in JSON or YAML format."
 msgstr ""
 
-#: awx/main/models/inventory.py:77
+#: awx/main/models/inventory.py:86
 msgid "Flag indicating whether any hosts in this inventory have failed."
 msgstr ""
 
-#: awx/main/models/inventory.py:82
+#: awx/main/models/inventory.py:91
 msgid "Total number of hosts in this inventory."
 msgstr ""
 
-#: awx/main/models/inventory.py:87
+#: awx/main/models/inventory.py:96
 msgid "Number of hosts in this inventory with active failures."
 msgstr ""
 
-#: awx/main/models/inventory.py:92
+#: awx/main/models/inventory.py:101
 msgid "Total number of groups in this inventory."
 msgstr ""
 
-#: awx/main/models/inventory.py:97
+#: awx/main/models/inventory.py:106
 msgid "Number of groups in this inventory with active failures."
 msgstr ""
 
-#: awx/main/models/inventory.py:102
+#: awx/main/models/inventory.py:111
 msgid ""
 "Flag indicating whether this inventory has any external inventory sources."
 msgstr ""
 
-#: awx/main/models/inventory.py:107
+#: awx/main/models/inventory.py:116
 msgid ""
 "Total number of external inventory sources configured within this inventory."
 msgstr ""
 
-#: awx/main/models/inventory.py:112
+#: awx/main/models/inventory.py:121
 msgid "Number of external inventory sources in this inventory with failures."
 msgstr ""
 
-#: awx/main/models/inventory.py:119
+#: awx/main/models/inventory.py:128
 msgid "Kind of inventory being represented."
 msgstr ""
 
-#: awx/main/models/inventory.py:125
+#: awx/main/models/inventory.py:134
 msgid "Filter that will be applied to the hosts of this inventory."
 msgstr ""
 
-#: awx/main/models/inventory.py:152
+#: awx/main/models/inventory.py:161
 msgid ""
 "Credentials to be used by hosts belonging to this inventory when accessing "
 "Red Hat Insights API."
 msgstr ""
 
-#: awx/main/models/inventory.py:161
+#: awx/main/models/inventory.py:170
 msgid "Flag indicating the inventory is being deleted."
 msgstr ""
 
-#: awx/main/models/inventory.py:374
+#: awx/main/models/inventory.py:459
 msgid "Assignment not allowed for Smart Inventory"
 msgstr ""
 
-#: awx/main/models/inventory.py:376 awx/main/models/projects.py:148
+#: awx/main/models/inventory.py:461 awx/main/models/projects.py:159
 msgid "Credential kind must be 'insights'."
 msgstr ""
 
-#: awx/main/models/inventory.py:443
+#: awx/main/models/inventory.py:546
 msgid "Is this host online and available for running jobs?"
 msgstr ""
 
-#: awx/main/models/inventory.py:449
+#: awx/main/models/inventory.py:552
 msgid ""
 "The value used by the remote inventory source to uniquely identify the host"
 msgstr ""
 
-#: awx/main/models/inventory.py:454
+#: awx/main/models/inventory.py:557
 msgid "Host variables in JSON or YAML format."
 msgstr ""
 
-#: awx/main/models/inventory.py:476
+#: awx/main/models/inventory.py:579
 msgid "Flag indicating whether the last job failed for this host."
 msgstr ""
 
-#: awx/main/models/inventory.py:481
+#: awx/main/models/inventory.py:584
 msgid ""
 "Flag indicating whether this host was created/updated from any external "
 "inventory sources."
 msgstr ""
 
-#: awx/main/models/inventory.py:487
+#: awx/main/models/inventory.py:590
 msgid "Inventory source(s) that created or modified this host."
 msgstr ""
 
-#: awx/main/models/inventory.py:492
+#: awx/main/models/inventory.py:595
 msgid "Arbitrary JSON structure of most recent ansible_facts, per-host."
 msgstr ""
 
-#: awx/main/models/inventory.py:498
+#: awx/main/models/inventory.py:601
 msgid "The date and time ansible_facts was last modified."
 msgstr ""
 
-#: awx/main/models/inventory.py:505
+#: awx/main/models/inventory.py:608
 msgid "Red Hat Insights host unique identifier."
 msgstr ""
 
-#: awx/main/models/inventory.py:633
+#: awx/main/models/inventory.py:743
 msgid "Group variables in JSON or YAML format."
 msgstr ""
 
-#: awx/main/models/inventory.py:639
+#: awx/main/models/inventory.py:749
 msgid "Hosts associated directly with this group."
 msgstr ""
 
-#: awx/main/models/inventory.py:644
+#: awx/main/models/inventory.py:754
 msgid "Total number of hosts directly or indirectly in this group."
 msgstr ""
 
-#: awx/main/models/inventory.py:649
+#: awx/main/models/inventory.py:759
 msgid "Flag indicating whether this group has any hosts with active failures."
 msgstr ""
 
-#: awx/main/models/inventory.py:654
+#: awx/main/models/inventory.py:764
 msgid "Number of hosts in this group with active failures."
 msgstr ""
 
-#: awx/main/models/inventory.py:659
+#: awx/main/models/inventory.py:769
 msgid "Total number of child groups contained within this group."
 msgstr ""
 
-#: awx/main/models/inventory.py:664
+#: awx/main/models/inventory.py:774
 msgid "Number of child groups within this group that have active failures."
 msgstr ""
 
-#: awx/main/models/inventory.py:669
+#: awx/main/models/inventory.py:779
 msgid ""
 "Flag indicating whether this group was created/updated from any external "
 "inventory sources."
 msgstr ""
 
-#: awx/main/models/inventory.py:675
+#: awx/main/models/inventory.py:785
 msgid "Inventory source(s) that created or modified this group."
 msgstr ""
 
-#: awx/main/models/inventory.py:865 awx/main/models/projects.py:42
-#: awx/main/models/unified_jobs.py:428
+#: awx/main/models/inventory.py:981 awx/main/models/projects.py:53
+#: awx/main/models/unified_jobs.py:518
 msgid "Manual"
 msgstr ""
 
-#: awx/main/models/inventory.py:866
+#: awx/main/models/inventory.py:982
 msgid "File, Directory or Script"
 msgstr ""
 
-#: awx/main/models/inventory.py:867
+#: awx/main/models/inventory.py:983
 msgid "Sourced from a Project"
 msgstr ""
 
-#: awx/main/models/inventory.py:868
+#: awx/main/models/inventory.py:984
 msgid "Amazon EC2"
 msgstr ""
 
-#: awx/main/models/inventory.py:869
+#: awx/main/models/inventory.py:985
 msgid "Google Compute Engine"
 msgstr ""
 
-#: awx/main/models/inventory.py:870
+#: awx/main/models/inventory.py:986
 msgid "Microsoft Azure Resource Manager"
 msgstr ""
 
-#: awx/main/models/inventory.py:871
+#: awx/main/models/inventory.py:987
 msgid "VMware vCenter"
 msgstr ""
 
-#: awx/main/models/inventory.py:872
+#: awx/main/models/inventory.py:988
 msgid "Red Hat Satellite 6"
 msgstr ""
 
-#: awx/main/models/inventory.py:873
+#: awx/main/models/inventory.py:989
 msgid "Red Hat CloudForms"
 msgstr ""
 
-#: awx/main/models/inventory.py:874
+#: awx/main/models/inventory.py:990
 msgid "OpenStack"
 msgstr ""
 
-#: awx/main/models/inventory.py:875
-msgid "oVirt4"
+#: awx/main/models/inventory.py:991
+msgid "Red Hat Virtualization"
 msgstr ""
 
-#: awx/main/models/inventory.py:876
+#: awx/main/models/inventory.py:992
 msgid "Ansible Tower"
 msgstr ""
 
-#: awx/main/models/inventory.py:877
+#: awx/main/models/inventory.py:993
 msgid "Custom Script"
 msgstr ""
 
-#: awx/main/models/inventory.py:994
+#: awx/main/models/inventory.py:1110
 msgid "Inventory source variables in YAML or JSON format."
 msgstr ""
 
-#: awx/main/models/inventory.py:1013
+#: awx/main/models/inventory.py:1121
 msgid ""
 "Comma-separated list of filter expressions (EC2 only). Hosts are imported "
 "when ANY of the filters match."
 msgstr ""
 
-#: awx/main/models/inventory.py:1019
+#: awx/main/models/inventory.py:1127
 msgid "Limit groups automatically created from inventory source (EC2 only)."
 msgstr ""
 
-#: awx/main/models/inventory.py:1023
+#: awx/main/models/inventory.py:1131
 msgid "Overwrite local groups and hosts from remote inventory source."
 msgstr ""
 
-#: awx/main/models/inventory.py:1027
+#: awx/main/models/inventory.py:1135
 msgid "Overwrite local variables from remote inventory source."
 msgstr ""
 
-#: awx/main/models/inventory.py:1032 awx/main/models/jobs.py:160
-#: awx/main/models/projects.py:117
+#: awx/main/models/inventory.py:1140 awx/main/models/jobs.py:140
+#: awx/main/models/projects.py:128
 msgid "The amount of time (in seconds) to run before the task is canceled."
 msgstr ""
 
-#: awx/main/models/inventory.py:1065
+#: awx/main/models/inventory.py:1173
 msgid "Image ID"
 msgstr ""
 
-#: awx/main/models/inventory.py:1066
+#: awx/main/models/inventory.py:1174
 msgid "Availability Zone"
 msgstr ""
 
-#: awx/main/models/inventory.py:1067
+#: awx/main/models/inventory.py:1175
 msgid "Account"
 msgstr ""
 
-#: awx/main/models/inventory.py:1068
+#: awx/main/models/inventory.py:1176
 msgid "Instance ID"
 msgstr ""
 
-#: awx/main/models/inventory.py:1069
+#: awx/main/models/inventory.py:1177
 msgid "Instance State"
 msgstr ""
 
-#: awx/main/models/inventory.py:1070
+#: awx/main/models/inventory.py:1178
+msgid "Platform"
+msgstr ""
+
+#: awx/main/models/inventory.py:1179
 msgid "Instance Type"
 msgstr ""
 
-#: awx/main/models/inventory.py:1071
+#: awx/main/models/inventory.py:1180
 msgid "Key Name"
 msgstr ""
 
-#: awx/main/models/inventory.py:1072
+#: awx/main/models/inventory.py:1181
 msgid "Region"
 msgstr ""
 
-#: awx/main/models/inventory.py:1073
+#: awx/main/models/inventory.py:1182
 msgid "Security Group"
 msgstr ""
 
-#: awx/main/models/inventory.py:1074
+#: awx/main/models/inventory.py:1183
 msgid "Tags"
 msgstr ""
 
-#: awx/main/models/inventory.py:1075
+#: awx/main/models/inventory.py:1184
 msgid "Tag None"
 msgstr ""
 
-#: awx/main/models/inventory.py:1076
+#: awx/main/models/inventory.py:1185
 msgid "VPC ID"
 msgstr ""
 
-#: awx/main/models/inventory.py:1145
+#: awx/main/models/inventory.py:1253
 #, python-format
 msgid ""
 "Cloud-based inventory sources (such as %s) require credentials for the "
 "matching cloud service."
 msgstr ""
 
-#: awx/main/models/inventory.py:1152
+#: awx/main/models/inventory.py:1259
 msgid "Credential is required for a cloud source."
 msgstr ""
 
-#: awx/main/models/inventory.py:1155
+#: awx/main/models/inventory.py:1262
 msgid ""
 "Credentials of type machine, source control, insights and vault are "
 "disallowed for custom inventory sources."
 msgstr ""
 
-#: awx/main/models/inventory.py:1179
+#: awx/main/models/inventory.py:1314
 #, python-format
 msgid "Invalid %(source)s region: %(region)s"
 msgstr ""
 
-#: awx/main/models/inventory.py:1203
+#: awx/main/models/inventory.py:1338
 #, python-format
 msgid "Invalid filter expression: %(filter)s"
 msgstr ""
 
-#: awx/main/models/inventory.py:1224
+#: awx/main/models/inventory.py:1359
 #, python-format
 msgid "Invalid group by choice: %(choice)s"
 msgstr ""
 
-#: awx/main/models/inventory.py:1259
+#: awx/main/models/inventory.py:1394
 msgid "Project containing inventory file used as source."
 msgstr ""
 
-#: awx/main/models/inventory.py:1407
+#: awx/main/models/inventory.py:1555
 #, python-format
 msgid ""
 "Unable to configure this item for cloud sync. It is already managed by %s."
 msgstr ""
 
-#: awx/main/models/inventory.py:1417
+#: awx/main/models/inventory.py:1565
 msgid ""
 "More than one SCM-based inventory source with update on project update per-"
 "inventory not allowed."
 msgstr ""
 
-#: awx/main/models/inventory.py:1424
+#: awx/main/models/inventory.py:1572
 msgid ""
 "Cannot update SCM-based inventory source on launch if set to update on "
 "project update. Instead, configure the corresponding source project to "
 "update on launch."
 msgstr ""
 
-#: awx/main/models/inventory.py:1430
-msgid "SCM type sources must set `overwrite_vars` to `true`."
+#: awx/main/models/inventory.py:1579
+msgid "SCM type sources must set `overwrite_vars` to `true` until Ansible 2.5."
 msgstr ""
 
-#: awx/main/models/inventory.py:1435
+#: awx/main/models/inventory.py:1584
 msgid "Cannot set source_path if not SCM type."
 msgstr ""
 
-#: awx/main/models/inventory.py:1460
+#: awx/main/models/inventory.py:1615
 msgid ""
 "Inventory files from this Project Update were used for the inventory update."
 msgstr ""
 
-#: awx/main/models/inventory.py:1573
+#: awx/main/models/inventory.py:1725
 msgid "Inventory script contents"
 msgstr ""
 
-#: awx/main/models/inventory.py:1578
+#: awx/main/models/inventory.py:1730
 msgid "Organization owning this inventory script"
 msgstr ""
 
@@ -2588,288 +2979,280 @@ msgid ""
 "shown in the standard output"
 msgstr ""
 
-#: awx/main/models/jobs.py:164
+#: awx/main/models/jobs.py:145
 msgid ""
 "If enabled, Tower will act as an Ansible Fact Cache Plugin; persisting facts "
 "at the end of a playbook run to the database and caching facts for use by "
 "Ansible."
 msgstr ""
 
-#: awx/main/models/jobs.py:173
-msgid "You must provide an SSH credential."
-msgstr ""
-
-#: awx/main/models/jobs.py:181
+#: awx/main/models/jobs.py:163
 msgid "You must provide a Vault credential."
 msgstr ""
 
-#: awx/main/models/jobs.py:317
+#: awx/main/models/jobs.py:308
 msgid "Job Template must provide 'inventory' or allow prompting for it."
 msgstr ""
 
-#: awx/main/models/jobs.py:321
-msgid "Job Template must provide 'credential' or allow prompting for it."
+#: awx/main/models/jobs.py:403
+msgid "Field is not configured to prompt on launch."
 msgstr ""
 
-#: awx/main/models/jobs.py:427
-msgid "Cannot override job_type to or from a scan job."
+#: awx/main/models/jobs.py:407
+msgid "Saved launch configurations cannot provide passwords needed to start."
 msgstr ""
 
-#: awx/main/models/jobs.py:493 awx/main/models/projects.py:263
+#: awx/main/models/jobs.py:415
+msgid "Job Template {} is missing or undefined."
+msgstr ""
+
+#: awx/main/models/jobs.py:496 awx/main/models/projects.py:276
 msgid "SCM Revision"
 msgstr ""
 
-#: awx/main/models/jobs.py:494
+#: awx/main/models/jobs.py:497
 msgid "The SCM Revision from the Project used for this job, if available"
 msgstr ""
 
-#: awx/main/models/jobs.py:502
+#: awx/main/models/jobs.py:505
 msgid ""
 "The SCM Refresh task used to make sure the playbooks were available for the "
 "job run"
 msgstr ""
 
-#: awx/main/models/jobs.py:809
+#: awx/main/models/jobs.py:632
+#, python-brace-format
+msgid "{status_value} is not a valid status option."
+msgstr ""
+
+#: awx/main/models/jobs.py:991
 msgid "job host summaries"
 msgstr ""
 
-#: awx/main/models/jobs.py:913
-msgid "Host Failure"
-msgstr ""
-
-#: awx/main/models/jobs.py:916 awx/main/models/jobs.py:930
-msgid "No Hosts Remaining"
-msgstr ""
-
-#: awx/main/models/jobs.py:917
-msgid "Host Polling"
-msgstr ""
-
-#: awx/main/models/jobs.py:918
-msgid "Host Async OK"
-msgstr ""
-
-#: awx/main/models/jobs.py:919
-msgid "Host Async Failure"
-msgstr ""
-
-#: awx/main/models/jobs.py:920
-msgid "Item OK"
-msgstr ""
-
-#: awx/main/models/jobs.py:921
-msgid "Item Failed"
-msgstr ""
-
-#: awx/main/models/jobs.py:922
-msgid "Item Skipped"
-msgstr ""
-
-#: awx/main/models/jobs.py:923
-msgid "Host Retry"
-msgstr ""
-
-#: awx/main/models/jobs.py:925
-msgid "File Difference"
-msgstr ""
-
-#: awx/main/models/jobs.py:926
-msgid "Playbook Started"
-msgstr ""
-
-#: awx/main/models/jobs.py:927
-msgid "Running Handlers"
-msgstr ""
-
-#: awx/main/models/jobs.py:928
-msgid "Including File"
-msgstr ""
-
-#: awx/main/models/jobs.py:929
-msgid "No Hosts Matched"
-msgstr ""
-
-#: awx/main/models/jobs.py:931
-msgid "Task Started"
-msgstr ""
-
-#: awx/main/models/jobs.py:933
-msgid "Variables Prompted"
-msgstr ""
-
-#: awx/main/models/jobs.py:934
-msgid "Gathering Facts"
-msgstr ""
-
-#: awx/main/models/jobs.py:935
-msgid "internal: on Import for Host"
-msgstr ""
-
-#: awx/main/models/jobs.py:936
-msgid "internal: on Not Import for Host"
-msgstr ""
-
-#: awx/main/models/jobs.py:937
-msgid "Play Started"
-msgstr ""
-
-#: awx/main/models/jobs.py:938
-msgid "Playbook Complete"
-msgstr ""
-
-#: awx/main/models/jobs.py:1351
+#: awx/main/models/jobs.py:1062
 msgid "Remove jobs older than a certain number of days"
 msgstr ""
 
-#: awx/main/models/jobs.py:1352
+#: awx/main/models/jobs.py:1063
 msgid "Remove activity stream entries older than a certain number of days"
 msgstr ""
 
-#: awx/main/models/jobs.py:1353
+#: awx/main/models/jobs.py:1064
 msgid "Purge and/or reduce the granularity of system tracking data"
 msgstr ""
 
+#: awx/main/models/jobs.py:1134
+#, python-brace-format
+msgid "Variables {list_of_keys} are not allowed for system jobs."
+msgstr ""
+
+#: awx/main/models/jobs.py:1149
+msgid "days must be a positive integer."
+msgstr ""
+
 #: awx/main/models/label.py:29
 msgid "Organization this label belongs to."
 msgstr ""
 
-#: awx/main/models/notifications.py:138 awx/main/models/unified_jobs.py:59
+#: awx/main/models/mixins.py:309
+#, python-brace-format
+msgid ""
+"Variables {list_of_keys} are not allowed on launch. Check the Prompt on "
+"Launch setting on the Job Template to include Extra Variables."
+msgstr ""
+
+#: awx/main/models/mixins.py:446
+msgid "{} is not a valid virtualenv in {}"
+msgstr ""
+
+#: awx/main/models/notifications.py:42
+msgid "Rocket.Chat"
+msgstr ""
+
+#: awx/main/models/notifications.py:142 awx/main/models/unified_jobs.py:62
 msgid "Pending"
 msgstr ""
 
-#: awx/main/models/notifications.py:139 awx/main/models/unified_jobs.py:62
+#: awx/main/models/notifications.py:143 awx/main/models/unified_jobs.py:65
 msgid "Successful"
 msgstr ""
 
-#: awx/main/models/notifications.py:140 awx/main/models/unified_jobs.py:63
+#: awx/main/models/notifications.py:144 awx/main/models/unified_jobs.py:66
 msgid "Failed"
 msgstr ""
 
-#: awx/main/models/organization.py:132
-msgid "Token not invalidated"
+#: awx/main/models/notifications.py:218
+msgid "status_str must be either succeeded or failed"
 msgstr ""
 
-#: awx/main/models/organization.py:133
-msgid "Token is expired"
+#: awx/main/models/oauth.py:27
+msgid "application"
 msgstr ""
 
-#: awx/main/models/organization.py:134
-msgid "The maximum number of allowed sessions for this user has been exceeded."
+#: awx/main/models/oauth.py:32
+msgid "Confidential"
 msgstr ""
 
-#: awx/main/models/organization.py:137
-msgid "Invalid token"
+#: awx/main/models/oauth.py:33
+msgid "Public"
 msgstr ""
 
-#: awx/main/models/organization.py:155
-msgid "Reason the auth token was invalidated."
+#: awx/main/models/oauth.py:41
+msgid "Authorization code"
 msgstr ""
 
-#: awx/main/models/organization.py:194
-msgid "Invalid reason specified"
+#: awx/main/models/oauth.py:42
+msgid "Implicit"
 msgstr ""
 
-#: awx/main/models/projects.py:43
+#: awx/main/models/oauth.py:43
+msgid "Resource owner password-based"
+msgstr ""
+
+#: awx/main/models/oauth.py:44
+msgid "Client credentials"
+msgstr ""
+
+#: awx/main/models/oauth.py:59
+msgid "Organization containing this application."
+msgstr ""
+
+#: awx/main/models/oauth.py:68
+msgid ""
+"Used for more stringent verification of access to an application when "
+"creating a token."
+msgstr ""
+
+#: awx/main/models/oauth.py:73
+msgid ""
+"Set to Public or Confidential depending on how secure the client device is."
+msgstr ""
+
+#: awx/main/models/oauth.py:77
+msgid ""
+"Set True to skip authorization step for completely trusted applications."
+msgstr ""
+
+#: awx/main/models/oauth.py:82
+msgid ""
+"The Grant type the user must use for acquire tokens for this application."
+msgstr ""
+
+#: awx/main/models/oauth.py:90
+msgid "access token"
+msgstr ""
+
+#: awx/main/models/oauth.py:98
+msgid "The user representing the token owner"
+msgstr ""
+
+#: awx/main/models/oauth.py:112
+msgid ""
+"Allowed scopes, further restricts user's permissions. Must be a simple space-"
+"separated string with allowed scopes ['read', 'write']."
+msgstr ""
+
+#: awx/main/models/projects.py:54
 msgid "Git"
 msgstr ""
 
-#: awx/main/models/projects.py:44
+#: awx/main/models/projects.py:55
 msgid "Mercurial"
 msgstr ""
 
-#: awx/main/models/projects.py:45
+#: awx/main/models/projects.py:56
 msgid "Subversion"
 msgstr ""
 
-#: awx/main/models/projects.py:46
+#: awx/main/models/projects.py:57
 msgid "Red Hat Insights"
 msgstr ""
 
-#: awx/main/models/projects.py:72
+#: awx/main/models/projects.py:83
 msgid ""
 "Local path (relative to PROJECTS_ROOT) containing playbooks and related "
 "files for this project."
 msgstr ""
 
-#: awx/main/models/projects.py:81
+#: awx/main/models/projects.py:92
 msgid "SCM Type"
 msgstr ""
 
-#: awx/main/models/projects.py:82
+#: awx/main/models/projects.py:93
 msgid "Specifies the source control system used to store the project."
 msgstr ""
 
-#: awx/main/models/projects.py:88
+#: awx/main/models/projects.py:99
 msgid "SCM URL"
 msgstr ""
 
-#: awx/main/models/projects.py:89
+#: awx/main/models/projects.py:100
 msgid "The location where the project is stored."
 msgstr ""
 
-#: awx/main/models/projects.py:95
+#: awx/main/models/projects.py:106
 msgid "SCM Branch"
 msgstr ""
 
-#: awx/main/models/projects.py:96
+#: awx/main/models/projects.py:107
 msgid "Specific branch, tag or commit to checkout."
 msgstr ""
 
-#: awx/main/models/projects.py:100
+#: awx/main/models/projects.py:111
 msgid "Discard any local changes before syncing the project."
 msgstr ""
 
-#: awx/main/models/projects.py:104
+#: awx/main/models/projects.py:115
 msgid "Delete the project before syncing."
 msgstr ""
 
-#: awx/main/models/projects.py:133
+#: awx/main/models/projects.py:144
 msgid "Invalid SCM URL."
 msgstr ""
 
-#: awx/main/models/projects.py:136
+#: awx/main/models/projects.py:147
 msgid "SCM URL is required."
 msgstr ""
 
-#: awx/main/models/projects.py:144
+#: awx/main/models/projects.py:155
 msgid "Insights Credential is required for an Insights Project."
 msgstr ""
 
-#: awx/main/models/projects.py:150
+#: awx/main/models/projects.py:161
 msgid "Credential kind must be 'scm'."
 msgstr ""
 
-#: awx/main/models/projects.py:167
+#: awx/main/models/projects.py:178
 msgid "Invalid credential."
 msgstr ""
 
-#: awx/main/models/projects.py:249
+#: awx/main/models/projects.py:262
 msgid "Update the project when a job is launched that uses the project."
 msgstr ""
 
-#: awx/main/models/projects.py:254
+#: awx/main/models/projects.py:267
 msgid ""
 "The number of seconds after the last project update ran that a newproject "
 "update will be launched as a job dependency."
 msgstr ""
 
-#: awx/main/models/projects.py:264
+#: awx/main/models/projects.py:277
 msgid "The last revision fetched by a project update"
 msgstr ""
 
-#: awx/main/models/projects.py:271
+#: awx/main/models/projects.py:284
 msgid "Playbook Files"
 msgstr ""
 
-#: awx/main/models/projects.py:272
+#: awx/main/models/projects.py:285
 msgid "List of playbooks found in the project"
 msgstr ""
 
-#: awx/main/models/projects.py:279
+#: awx/main/models/projects.py:292
 msgid "Inventory Files"
 msgstr ""
 
-#: awx/main/models/projects.py:280
+#: awx/main/models/projects.py:293
 msgid ""
 "Suggested list of content that could be Ansible inventory in the project"
 msgstr ""
@@ -2891,213 +3274,275 @@ msgid "Admin"
 msgstr ""
 
 #: awx/main/models/rbac.py:40
-msgid "Auditor"
+msgid "Project Admin"
 msgstr ""
 
 #: awx/main/models/rbac.py:41
-msgid "Execute"
+msgid "Inventory Admin"
 msgstr ""
 
 #: awx/main/models/rbac.py:42
-msgid "Member"
+msgid "Credential Admin"
 msgstr ""
 
 #: awx/main/models/rbac.py:43
-msgid "Read"
+msgid "Workflow Admin"
 msgstr ""
 
 #: awx/main/models/rbac.py:44
-msgid "Update"
+msgid "Notification Admin"
 msgstr ""
 
 #: awx/main/models/rbac.py:45
-msgid "Use"
+msgid "Auditor"
+msgstr ""
+
+#: awx/main/models/rbac.py:46
+msgid "Execute"
+msgstr ""
+
+#: awx/main/models/rbac.py:47
+msgid "Member"
+msgstr ""
+
+#: awx/main/models/rbac.py:48
+msgid "Read"
 msgstr ""
 
 #: awx/main/models/rbac.py:49
-msgid "Can manage all aspects of the system"
+msgid "Update"
 msgstr ""
 
 #: awx/main/models/rbac.py:50
+msgid "Use"
+msgstr ""
+
+#: awx/main/models/rbac.py:54
+msgid "Can manage all aspects of the system"
+msgstr ""
+
+#: awx/main/models/rbac.py:55
 msgid "Can view all settings on the system"
 msgstr ""
 
-#: awx/main/models/rbac.py:51
+#: awx/main/models/rbac.py:56
 msgid "May run ad hoc commands on an inventory"
 msgstr ""
 
-#: awx/main/models/rbac.py:52
+#: awx/main/models/rbac.py:57
 #, python-format
 msgid "Can manage all aspects of the %s"
 msgstr ""
 
-#: awx/main/models/rbac.py:53
+#: awx/main/models/rbac.py:58
+#, python-format
+msgid "Can manage all projects of the %s"
+msgstr ""
+
+#: awx/main/models/rbac.py:59
+#, python-format
+msgid "Can manage all inventories of the %s"
+msgstr ""
+
+#: awx/main/models/rbac.py:60
+#, python-format
+msgid "Can manage all credentials of the %s"
+msgstr ""
+
+#: awx/main/models/rbac.py:61
+#, python-format
+msgid "Can manage all workflows of the %s"
+msgstr ""
+
+#: awx/main/models/rbac.py:62
+#, python-format
+msgid "Can manage all notifications of the %s"
+msgstr ""
+
+#: awx/main/models/rbac.py:63
 #, python-format
 msgid "Can view all settings for the %s"
 msgstr ""
 
-#: awx/main/models/rbac.py:54
+#: awx/main/models/rbac.py:65
+msgid "May run any executable resources in the organization"
+msgstr ""
+
+#: awx/main/models/rbac.py:66
 #, python-format
 msgid "May run the %s"
 msgstr ""
 
-#: awx/main/models/rbac.py:55
+#: awx/main/models/rbac.py:68
 #, python-format
 msgid "User is a member of the %s"
 msgstr ""
 
-#: awx/main/models/rbac.py:56
+#: awx/main/models/rbac.py:69
 #, python-format
 msgid "May view settings for the %s"
 msgstr ""
 
-#: awx/main/models/rbac.py:57
+#: awx/main/models/rbac.py:70
 msgid ""
 "May update project or inventory or group using the configured source update "
 "system"
 msgstr ""
 
-#: awx/main/models/rbac.py:58
+#: awx/main/models/rbac.py:71
 #, python-format
 msgid "Can use the %s in a job template"
 msgstr ""
 
-#: awx/main/models/rbac.py:122
+#: awx/main/models/rbac.py:135
 msgid "roles"
 msgstr ""
 
-#: awx/main/models/rbac.py:434
+#: awx/main/models/rbac.py:441
 msgid "role_ancestors"
 msgstr ""
 
-#: awx/main/models/schedules.py:71
+#: awx/main/models/schedules.py:72
 msgid "Enables processing of this schedule."
 msgstr ""
 
-#: awx/main/models/schedules.py:77
+#: awx/main/models/schedules.py:78
 msgid "The first occurrence of the schedule occurs on or after this time."
 msgstr ""
 
-#: awx/main/models/schedules.py:83
+#: awx/main/models/schedules.py:84
 msgid ""
 "The last occurrence of the schedule occurs before this time, aftewards the "
 "schedule expires."
 msgstr ""
 
-#: awx/main/models/schedules.py:87
+#: awx/main/models/schedules.py:88
 msgid "A value representing the schedules iCal recurrence rule."
 msgstr ""
 
-#: awx/main/models/schedules.py:93
+#: awx/main/models/schedules.py:94
 msgid "The next time that the scheduled action will run."
 msgstr ""
 
-#: awx/main/models/schedules.py:109
-msgid "Expected JSON"
-msgstr ""
-
-#: awx/main/models/schedules.py:121
-msgid "days must be a positive integer."
-msgstr ""
-
-#: awx/main/models/unified_jobs.py:58
+#: awx/main/models/unified_jobs.py:61
 msgid "New"
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:60
+#: awx/main/models/unified_jobs.py:63
 msgid "Waiting"
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:61
+#: awx/main/models/unified_jobs.py:64
 msgid "Running"
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:65
+#: awx/main/models/unified_jobs.py:68
 msgid "Canceled"
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:69
+#: awx/main/models/unified_jobs.py:72
 msgid "Never Updated"
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:73 awx/ui/templates/ui/index.html:67
-#: awx/ui/templates/ui/index.html.py:86
+#: awx/main/models/unified_jobs.py:76
 msgid "OK"
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:74
+#: awx/main/models/unified_jobs.py:77
 msgid "Missing"
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:78
+#: awx/main/models/unified_jobs.py:81
 msgid "No External Source"
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:85
+#: awx/main/models/unified_jobs.py:88
 msgid "Updating"
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:429
-msgid "Relaunch"
+#: awx/main/models/unified_jobs.py:427
+msgid "Field is not allowed on launch."
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:430
-msgid "Callback"
-msgstr ""
-
-#: awx/main/models/unified_jobs.py:431
-msgid "Scheduled"
-msgstr ""
-
-#: awx/main/models/unified_jobs.py:432
-msgid "Dependency"
-msgstr ""
-
-#: awx/main/models/unified_jobs.py:433
-msgid "Workflow"
-msgstr ""
-
-#: awx/main/models/unified_jobs.py:434
-msgid "Sync"
-msgstr ""
-
-#: awx/main/models/unified_jobs.py:481
-msgid "The node the job executed on."
-msgstr ""
-
-#: awx/main/models/unified_jobs.py:507
-msgid "The date and time the job was queued for starting."
-msgstr ""
-
-#: awx/main/models/unified_jobs.py:513
-msgid "The date and time the job finished execution."
+#: awx/main/models/unified_jobs.py:455
+#, python-brace-format
+msgid ""
+"Variables {list_of_keys} provided, but this template cannot accept variables."
 msgstr ""
 
 #: awx/main/models/unified_jobs.py:519
+msgid "Relaunch"
+msgstr ""
+
+#: awx/main/models/unified_jobs.py:520
+msgid "Callback"
+msgstr ""
+
+#: awx/main/models/unified_jobs.py:521
+msgid "Scheduled"
+msgstr ""
+
+#: awx/main/models/unified_jobs.py:522
+msgid "Dependency"
+msgstr ""
+
+#: awx/main/models/unified_jobs.py:523
+msgid "Workflow"
+msgstr ""
+
+#: awx/main/models/unified_jobs.py:524
+msgid "Sync"
+msgstr ""
+
+#: awx/main/models/unified_jobs.py:572
+msgid "The node the job executed on."
+msgstr ""
+
+#: awx/main/models/unified_jobs.py:598
+msgid "The date and time the job was queued for starting."
+msgstr ""
+
+#: awx/main/models/unified_jobs.py:604
+msgid "The date and time the job finished execution."
+msgstr ""
+
+#: awx/main/models/unified_jobs.py:610
 msgid "Elapsed time in seconds that the job ran."
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:541
+#: awx/main/models/unified_jobs.py:632
 msgid ""
 "A status field to indicate the state of the job if it wasn't able to run and "
 "capture stdout"
 msgstr ""
 
-#: awx/main/models/unified_jobs.py:580
+#: awx/main/models/unified_jobs.py:661
 msgid "The Rampart/Instance group the job was run under"
 msgstr ""
 
+#: awx/main/models/workflow.py:203
+#, python-brace-format
+msgid ""
+"Bad launch configuration starting template {template_pk} as part of workflow "
+"{workflow_pk}. Errors:\n"
+"{error_text}"
+msgstr ""
+
+#: awx/main/models/workflow.py:387
+msgid "Field is not allowed for use in workflows."
+msgstr ""
+
 #: awx/main/notifications/base.py:17 awx/main/notifications/email_backend.py:28
 msgid ""
 "{} #{} had status {}, view details at {}\n"
 "\n"
 msgstr ""
 
-#: awx/main/notifications/hipchat_backend.py:47
+#: awx/main/notifications/hipchat_backend.py:48
 msgid "Error sending messages: {}"
 msgstr ""
 
-#: awx/main/notifications/hipchat_backend.py:49
+#: awx/main/notifications/hipchat_backend.py:50
 msgid "Error sending message to hipchat: {}"
 msgstr ""
 
@@ -3105,16 +3550,27 @@ msgstr ""
 msgid "Exception connecting to irc server: {}"
 msgstr ""
 
+#: awx/main/notifications/mattermost_backend.py:48
+#: awx/main/notifications/mattermost_backend.py:50
+msgid "Error sending notification mattermost: {}"
+msgstr ""
+
 #: awx/main/notifications/pagerduty_backend.py:39
 msgid "Exception connecting to PagerDuty: {}"
 msgstr ""
 
 #: awx/main/notifications/pagerduty_backend.py:48
-#: awx/main/notifications/slack_backend.py:52
+#: awx/main/notifications/slack_backend.py:82
+#: awx/main/notifications/slack_backend.py:99
 #: awx/main/notifications/twilio_backend.py:46
 msgid "Exception sending messages: {}"
 msgstr ""
 
+#: awx/main/notifications/rocketchat_backend.py:46
+#: awx/main/notifications/rocketchat_backend.py:49
+msgid "Error sending notification rocket.chat: {}"
+msgstr ""
+
 #: awx/main/notifications/twilio_backend.py:36
 msgid "Exception connecting to Twilio: {}"
 msgstr ""
@@ -3124,140 +3580,156 @@ msgstr ""
 msgid "Error sending notification webhook: {}"
 msgstr ""
 
-#: awx/main/scheduler/task_manager.py:197
+#: awx/main/scheduler/task_manager.py:200
 msgid ""
 "Job spawned from workflow could not start because it was not in the right "
 "state or required manual credentials"
 msgstr ""
 
-#: awx/main/scheduler/task_manager.py:201
+#: awx/main/scheduler/task_manager.py:204
 msgid ""
 "Job spawned from workflow could not start because it was missing a related "
 "resource such as project or inventory"
 msgstr ""
 
-#: awx/main/tasks.py:184
+#: awx/main/signals.py:617
+msgid "limit_reached"
+msgstr ""
+
+#: awx/main/tasks.py:273
 msgid "Ansible Tower host usage over 90%"
 msgstr ""
 
-#: awx/main/tasks.py:189
+#: awx/main/tasks.py:278
 msgid "Ansible Tower license will expire soon"
 msgstr ""
 
-#: awx/main/tasks.py:318
-msgid "status_str must be either succeeded or failed"
+#: awx/main/tasks.py:1321
+msgid "Job could not start because it does not have a valid inventory."
 msgstr ""
 
-#: awx/main/tasks.py:1549
-msgid "Dependent inventory update {} was canceled."
-msgstr ""
-
-#: awx/main/utils/common.py:89
+#: awx/main/utils/common.py:97
 #, python-format
 msgid "Unable to convert \"%s\" to boolean"
 msgstr ""
 
-#: awx/main/utils/common.py:235
+#: awx/main/utils/common.py:251
 #, python-format
 msgid "Unsupported SCM type \"%s\""
 msgstr ""
 
-#: awx/main/utils/common.py:242 awx/main/utils/common.py:254
-#: awx/main/utils/common.py:273
+#: awx/main/utils/common.py:258 awx/main/utils/common.py:270
+#: awx/main/utils/common.py:289
 #, python-format
 msgid "Invalid %s URL"
 msgstr ""
 
-#: awx/main/utils/common.py:244 awx/main/utils/common.py:283
+#: awx/main/utils/common.py:260 awx/main/utils/common.py:299
 #, python-format
 msgid "Unsupported %s URL"
 msgstr ""
 
-#: awx/main/utils/common.py:285
+#: awx/main/utils/common.py:301
 #, python-format
 msgid "Unsupported host \"%s\" for file:// URL"
 msgstr ""
 
-#: awx/main/utils/common.py:287
+#: awx/main/utils/common.py:303
 #, python-format
 msgid "Host is required for %s URL"
 msgstr ""
 
-#: awx/main/utils/common.py:305
+#: awx/main/utils/common.py:321
 #, python-format
 msgid "Username must be \"git\" for SSH access to %s."
 msgstr ""
 
-#: awx/main/utils/common.py:311
+#: awx/main/utils/common.py:327
 #, python-format
 msgid "Username must be \"hg\" for SSH access to %s."
 msgstr ""
 
-#: awx/main/validators.py:60
+#: awx/main/utils/common.py:608
+#, python-brace-format
+msgid "Input type `{data_type}` is not a dictionary"
+msgstr ""
+
+#: awx/main/utils/common.py:641
+#, python-brace-format
+msgid "Variables not compatible with JSON standard (error: {json_error})"
+msgstr ""
+
+#: awx/main/utils/common.py:647
+#, python-brace-format
+msgid ""
+"Cannot parse as JSON (error: {json_error}) or YAML (error: {yaml_error})."
+msgstr ""
+
+#: awx/main/validators.py:67
 #, python-format
 msgid "Invalid certificate or key: %s..."
 msgstr ""
 
-#: awx/main/validators.py:74
+#: awx/main/validators.py:83
 #, python-format
 msgid "Invalid private key: unsupported type \"%s\""
 msgstr ""
 
-#: awx/main/validators.py:78
+#: awx/main/validators.py:87
 #, python-format
 msgid "Unsupported PEM object type: \"%s\""
 msgstr ""
 
-#: awx/main/validators.py:103
+#: awx/main/validators.py:112
 msgid "Invalid base64-encoded data"
 msgstr ""
 
-#: awx/main/validators.py:122
+#: awx/main/validators.py:131
 msgid "Exactly one private key is required."
 msgstr ""
 
-#: awx/main/validators.py:124
+#: awx/main/validators.py:133
 msgid "At least one private key is required."
 msgstr ""
 
-#: awx/main/validators.py:126
+#: awx/main/validators.py:135
 #, python-format
 msgid ""
 "At least %(min_keys)d private keys are required, only %(key_count)d provided."
 msgstr ""
 
-#: awx/main/validators.py:129
+#: awx/main/validators.py:138
 #, python-format
 msgid "Only one private key is allowed, %(key_count)d provided."
 msgstr ""
 
-#: awx/main/validators.py:131
+#: awx/main/validators.py:140
 #, python-format
 msgid ""
 "No more than %(max_keys)d private keys are allowed, %(key_count)d provided."
 msgstr ""
 
-#: awx/main/validators.py:136
+#: awx/main/validators.py:145
 msgid "Exactly one certificate is required."
 msgstr ""
 
-#: awx/main/validators.py:138
+#: awx/main/validators.py:147
 msgid "At least one certificate is required."
 msgstr ""
 
-#: awx/main/validators.py:140
+#: awx/main/validators.py:149
 #, python-format
 msgid ""
 "At least %(min_certs)d certificates are required, only %(cert_count)d "
 "provided."
 msgstr ""
 
-#: awx/main/validators.py:143
+#: awx/main/validators.py:152
 #, python-format
 msgid "Only one certificate is allowed, %(cert_count)d provided."
 msgstr ""
 
-#: awx/main/validators.py:145
+#: awx/main/validators.py:154
 #, python-format
 msgid ""
 "No more than %(max_certs)d certificates are allowed, %(cert_count)d provided."
@@ -3299,287 +3771,287 @@ msgstr ""
 msgid "A server error has occurred."
 msgstr ""
 
-#: awx/settings/defaults.py:665
+#: awx/settings/defaults.py:722
 msgid "US East (Northern Virginia)"
 msgstr ""
 
-#: awx/settings/defaults.py:666
+#: awx/settings/defaults.py:723
 msgid "US East (Ohio)"
 msgstr ""
 
-#: awx/settings/defaults.py:667
+#: awx/settings/defaults.py:724
 msgid "US West (Oregon)"
 msgstr ""
 
-#: awx/settings/defaults.py:668
+#: awx/settings/defaults.py:725
 msgid "US West (Northern California)"
 msgstr ""
 
-#: awx/settings/defaults.py:669
+#: awx/settings/defaults.py:726
 msgid "Canada (Central)"
 msgstr ""
 
-#: awx/settings/defaults.py:670
+#: awx/settings/defaults.py:727
 msgid "EU (Frankfurt)"
 msgstr ""
 
-#: awx/settings/defaults.py:671
+#: awx/settings/defaults.py:728
 msgid "EU (Ireland)"
 msgstr ""
 
-#: awx/settings/defaults.py:672
+#: awx/settings/defaults.py:729
 msgid "EU (London)"
 msgstr ""
 
-#: awx/settings/defaults.py:673
+#: awx/settings/defaults.py:730
 msgid "Asia Pacific (Singapore)"
 msgstr ""
 
-#: awx/settings/defaults.py:674
+#: awx/settings/defaults.py:731
 msgid "Asia Pacific (Sydney)"
 msgstr ""
 
-#: awx/settings/defaults.py:675
+#: awx/settings/defaults.py:732
 msgid "Asia Pacific (Tokyo)"
 msgstr ""
 
-#: awx/settings/defaults.py:676
+#: awx/settings/defaults.py:733
 msgid "Asia Pacific (Seoul)"
 msgstr ""
 
-#: awx/settings/defaults.py:677
+#: awx/settings/defaults.py:734
 msgid "Asia Pacific (Mumbai)"
 msgstr ""
 
-#: awx/settings/defaults.py:678
+#: awx/settings/defaults.py:735
 msgid "South America (Sao Paulo)"
 msgstr ""
 
-#: awx/settings/defaults.py:679
+#: awx/settings/defaults.py:736
 msgid "US West (GovCloud)"
 msgstr ""
 
-#: awx/settings/defaults.py:680
+#: awx/settings/defaults.py:737
 msgid "China (Beijing)"
 msgstr ""
 
-#: awx/settings/defaults.py:729
+#: awx/settings/defaults.py:786
 msgid "US East 1 (B)"
 msgstr ""
 
-#: awx/settings/defaults.py:730
+#: awx/settings/defaults.py:787
 msgid "US East 1 (C)"
 msgstr ""
 
-#: awx/settings/defaults.py:731
+#: awx/settings/defaults.py:788
 msgid "US East 1 (D)"
 msgstr ""
 
-#: awx/settings/defaults.py:732
+#: awx/settings/defaults.py:789
 msgid "US East 4 (A)"
 msgstr ""
 
-#: awx/settings/defaults.py:733
+#: awx/settings/defaults.py:790
 msgid "US East 4 (B)"
 msgstr ""
 
-#: awx/settings/defaults.py:734
+#: awx/settings/defaults.py:791
 msgid "US East 4 (C)"
 msgstr ""
 
-#: awx/settings/defaults.py:735
+#: awx/settings/defaults.py:792
 msgid "US Central (A)"
 msgstr ""
 
-#: awx/settings/defaults.py:736
+#: awx/settings/defaults.py:793
 msgid "US Central (B)"
 msgstr ""
 
-#: awx/settings/defaults.py:737
+#: awx/settings/defaults.py:794
 msgid "US Central (C)"
 msgstr ""
 
-#: awx/settings/defaults.py:738
+#: awx/settings/defaults.py:795
 msgid "US Central (F)"
 msgstr ""
 
-#: awx/settings/defaults.py:739
+#: awx/settings/defaults.py:796
 msgid "US West (A)"
 msgstr ""
 
-#: awx/settings/defaults.py:740
+#: awx/settings/defaults.py:797
 msgid "US West (B)"
 msgstr ""
 
-#: awx/settings/defaults.py:741
+#: awx/settings/defaults.py:798
 msgid "US West (C)"
 msgstr ""
 
-#: awx/settings/defaults.py:742
+#: awx/settings/defaults.py:799
 msgid "Europe West 1 (B)"
 msgstr ""
 
-#: awx/settings/defaults.py:743
+#: awx/settings/defaults.py:800
 msgid "Europe West 1 (C)"
 msgstr ""
 
-#: awx/settings/defaults.py:744
+#: awx/settings/defaults.py:801
 msgid "Europe West 1 (D)"
 msgstr ""
 
-#: awx/settings/defaults.py:745
+#: awx/settings/defaults.py:802
 msgid "Europe West 2 (A)"
 msgstr ""
 
-#: awx/settings/defaults.py:746
+#: awx/settings/defaults.py:803
 msgid "Europe West 2 (B)"
 msgstr ""
 
-#: awx/settings/defaults.py:747
+#: awx/settings/defaults.py:804
 msgid "Europe West 2 (C)"
 msgstr ""
 
-#: awx/settings/defaults.py:748
+#: awx/settings/defaults.py:805
 msgid "Asia East (A)"
 msgstr ""
 
-#: awx/settings/defaults.py:749
+#: awx/settings/defaults.py:806
 msgid "Asia East (B)"
 msgstr ""
 
-#: awx/settings/defaults.py:750
+#: awx/settings/defaults.py:807
 msgid "Asia East (C)"
 msgstr ""
 
-#: awx/settings/defaults.py:751
+#: awx/settings/defaults.py:808
 msgid "Asia Southeast (A)"
 msgstr ""
 
-#: awx/settings/defaults.py:752
+#: awx/settings/defaults.py:809
 msgid "Asia Southeast (B)"
 msgstr ""
 
-#: awx/settings/defaults.py:753
+#: awx/settings/defaults.py:810
 msgid "Asia Northeast (A)"
 msgstr ""
 
-#: awx/settings/defaults.py:754
+#: awx/settings/defaults.py:811
 msgid "Asia Northeast (B)"
 msgstr ""
 
-#: awx/settings/defaults.py:755
+#: awx/settings/defaults.py:812
 msgid "Asia Northeast (C)"
 msgstr ""
 
-#: awx/settings/defaults.py:756
+#: awx/settings/defaults.py:813
 msgid "Australia Southeast (A)"
 msgstr ""
 
-#: awx/settings/defaults.py:757
+#: awx/settings/defaults.py:814
 msgid "Australia Southeast (B)"
 msgstr ""
 
-#: awx/settings/defaults.py:758
+#: awx/settings/defaults.py:815
 msgid "Australia Southeast (C)"
 msgstr ""
 
-#: awx/settings/defaults.py:780
+#: awx/settings/defaults.py:837
 msgid "US East"
 msgstr ""
 
-#: awx/settings/defaults.py:781
+#: awx/settings/defaults.py:838
 msgid "US East 2"
 msgstr ""
 
-#: awx/settings/defaults.py:782
+#: awx/settings/defaults.py:839
 msgid "US Central"
 msgstr ""
 
-#: awx/settings/defaults.py:783
+#: awx/settings/defaults.py:840
 msgid "US North Central"
 msgstr ""
 
-#: awx/settings/defaults.py:784
+#: awx/settings/defaults.py:841
 msgid "US South Central"
 msgstr ""
 
-#: awx/settings/defaults.py:785
+#: awx/settings/defaults.py:842
 msgid "US West Central"
 msgstr ""
 
-#: awx/settings/defaults.py:786
+#: awx/settings/defaults.py:843
 msgid "US West"
 msgstr ""
 
-#: awx/settings/defaults.py:787
+#: awx/settings/defaults.py:844
 msgid "US West 2"
 msgstr ""
 
-#: awx/settings/defaults.py:788
+#: awx/settings/defaults.py:845
 msgid "Canada East"
 msgstr ""
 
-#: awx/settings/defaults.py:789
+#: awx/settings/defaults.py:846
 msgid "Canada Central"
 msgstr ""
 
-#: awx/settings/defaults.py:790
+#: awx/settings/defaults.py:847
 msgid "Brazil South"
 msgstr ""
 
-#: awx/settings/defaults.py:791
+#: awx/settings/defaults.py:848
 msgid "Europe North"
 msgstr ""
 
-#: awx/settings/defaults.py:792
+#: awx/settings/defaults.py:849
 msgid "Europe West"
 msgstr ""
 
-#: awx/settings/defaults.py:793
+#: awx/settings/defaults.py:850
 msgid "UK West"
 msgstr ""
 
-#: awx/settings/defaults.py:794
+#: awx/settings/defaults.py:851
 msgid "UK South"
 msgstr ""
 
-#: awx/settings/defaults.py:795
+#: awx/settings/defaults.py:852
 msgid "Asia East"
 msgstr ""
 
-#: awx/settings/defaults.py:796
+#: awx/settings/defaults.py:853
 msgid "Asia Southeast"
 msgstr ""
 
-#: awx/settings/defaults.py:797
+#: awx/settings/defaults.py:854
 msgid "Australia East"
 msgstr ""
 
-#: awx/settings/defaults.py:798
+#: awx/settings/defaults.py:855
 msgid "Australia Southeast"
 msgstr ""
 
-#: awx/settings/defaults.py:799
+#: awx/settings/defaults.py:856
 msgid "India West"
 msgstr ""
 
-#: awx/settings/defaults.py:800
+#: awx/settings/defaults.py:857
 msgid "India South"
 msgstr ""
 
-#: awx/settings/defaults.py:801
+#: awx/settings/defaults.py:858
 msgid "Japan East"
 msgstr ""
 
-#: awx/settings/defaults.py:802
+#: awx/settings/defaults.py:859
 msgid "Japan West"
 msgstr ""
 
-#: awx/settings/defaults.py:803
+#: awx/settings/defaults.py:860
 msgid "Korea Central"
 msgstr ""
 
-#: awx/settings/defaults.py:804
+#: awx/settings/defaults.py:861
 msgid "Korea South"
 msgstr ""
 
@@ -3595,7 +4067,7 @@ msgid ""
 "their\n"
 "username and email address. Configuration details are available in the "
 "Ansible\n"
-"Tower documentation.'"
+"Tower documentation."
 msgstr ""
 
 #: awx/sso/conf.py:55
@@ -3633,11 +4105,11 @@ msgid ""
 "have a user account with a matching email address will be able to login."
 msgstr ""
 
-#: awx/sso/conf.py:137
+#: awx/sso/conf.py:141
 msgid "LDAP Server URI"
 msgstr ""
 
-#: awx/sso/conf.py:138
+#: awx/sso/conf.py:142
 msgid ""
 "URI to connect to LDAP server, such as \"ldap://ldap.example.com:389\" (non-"
 "SSL) or \"ldaps://ldap.example.com:636\" (SSL). Multiple LDAP servers may be "
@@ -3645,46 +4117,47 @@ msgid ""
 "disabled if this parameter is empty."
 msgstr ""
 
-#: awx/sso/conf.py:142 awx/sso/conf.py:158 awx/sso/conf.py:170
-#: awx/sso/conf.py:182 awx/sso/conf.py:198 awx/sso/conf.py:218
-#: awx/sso/conf.py:240 awx/sso/conf.py:255 awx/sso/conf.py:273
-#: awx/sso/conf.py:290 awx/sso/conf.py:307 awx/sso/conf.py:323
-#: awx/sso/conf.py:337 awx/sso/conf.py:354 awx/sso/conf.py:380
+#: awx/sso/conf.py:146 awx/sso/conf.py:162 awx/sso/conf.py:174
+#: awx/sso/conf.py:186 awx/sso/conf.py:202 awx/sso/conf.py:222
+#: awx/sso/conf.py:244 awx/sso/conf.py:259 awx/sso/conf.py:277
+#: awx/sso/conf.py:294 awx/sso/conf.py:306 awx/sso/conf.py:332
+#: awx/sso/conf.py:348 awx/sso/conf.py:362 awx/sso/conf.py:380
+#: awx/sso/conf.py:406
 msgid "LDAP"
 msgstr ""
 
-#: awx/sso/conf.py:154
+#: awx/sso/conf.py:158
 msgid "LDAP Bind DN"
 msgstr ""
 
-#: awx/sso/conf.py:155
+#: awx/sso/conf.py:159
 msgid ""
 "DN (Distinguished Name) of user to bind for all search queries. This is the "
 "system user account we will use to login to query LDAP for other user "
 "information. Refer to the Ansible Tower documentation for example syntax."
 msgstr ""
 
-#: awx/sso/conf.py:168
+#: awx/sso/conf.py:172
 msgid "LDAP Bind Password"
 msgstr ""
 
-#: awx/sso/conf.py:169
+#: awx/sso/conf.py:173
 msgid "Password used to bind LDAP user account."
 msgstr ""
 
-#: awx/sso/conf.py:180
+#: awx/sso/conf.py:184
 msgid "LDAP Start TLS"
 msgstr ""
 
-#: awx/sso/conf.py:181
+#: awx/sso/conf.py:185
 msgid "Whether to enable TLS when the LDAP connection is not using SSL."
 msgstr ""
 
-#: awx/sso/conf.py:191
+#: awx/sso/conf.py:195
 msgid "LDAP Connection Options"
 msgstr ""
 
-#: awx/sso/conf.py:192
+#: awx/sso/conf.py:196
 msgid ""
 "Additional options to set for the LDAP connection.  LDAP referrals are "
 "disabled by default (to prevent certain LDAP queries from hanging with AD). "
@@ -3693,11 +4166,11 @@ msgid ""
 "values that can be set."
 msgstr ""
 
-#: awx/sso/conf.py:211
+#: awx/sso/conf.py:215
 msgid "LDAP User Search"
 msgstr ""
 
-#: awx/sso/conf.py:212
+#: awx/sso/conf.py:216
 msgid ""
 "LDAP search query to find users.  Any user that matches the given pattern "
 "will be able to login to Tower.  The user should also be mapped into a Tower "
@@ -3706,11 +4179,11 @@ msgid ""
 "possible. See Tower documentation for details."
 msgstr ""
 
-#: awx/sso/conf.py:234
+#: awx/sso/conf.py:238
 msgid "LDAP User DN Template"
 msgstr ""
 
-#: awx/sso/conf.py:235
+#: awx/sso/conf.py:239
 msgid ""
 "Alternative to user search, if user DNs are all of the same format. This "
 "approach is more efficient for user lookups than searching if it is usable "
@@ -3718,77 +4191,85 @@ msgid ""
 "used instead of AUTH_LDAP_USER_SEARCH."
 msgstr ""
 
-#: awx/sso/conf.py:250
+#: awx/sso/conf.py:254
 msgid "LDAP User Attribute Map"
 msgstr ""
 
-#: awx/sso/conf.py:251
+#: awx/sso/conf.py:255
 msgid ""
 "Mapping of LDAP user schema to Tower API user attributes. The default "
 "setting is valid for ActiveDirectory but users with other LDAP "
 "configurations may need to change the values. Refer to the Ansible Tower "
-"documentation for additonal details."
+"documentation for additional details."
 msgstr ""
 
-#: awx/sso/conf.py:269
+#: awx/sso/conf.py:273
 msgid "LDAP Group Search"
 msgstr ""
 
-#: awx/sso/conf.py:270
+#: awx/sso/conf.py:274
 msgid ""
 "Users are mapped to organizations based on their membership in LDAP groups. "
 "This setting defines the LDAP search query to find groups. Unlike the user "
 "search, group search does not support LDAPSearchUnion."
 msgstr ""
 
-#: awx/sso/conf.py:286
+#: awx/sso/conf.py:290
 msgid "LDAP Group Type"
 msgstr ""
 
-#: awx/sso/conf.py:287
+#: awx/sso/conf.py:291
 msgid ""
 "The group type may need to be changed based on the type of the LDAP server.  "
-"Values are listed at: http://pythonhosted.org/django-auth-ldap/groups."
-"html#types-of-groups"
+"Values are listed at: https://django-auth-ldap.readthedocs.io/en/stable/"
+"groups.html#types-of-groups"
 msgstr ""
 
-#: awx/sso/conf.py:302
+#: awx/sso/conf.py:304
+msgid "LDAP Group Type Parameters"
+msgstr ""
+
+#: awx/sso/conf.py:305
+msgid "Key value parameters to send the chosen group type init method."
+msgstr ""
+
+#: awx/sso/conf.py:327
 msgid "LDAP Require Group"
 msgstr ""
 
-#: awx/sso/conf.py:303
+#: awx/sso/conf.py:328
 msgid ""
 "Group DN required to login. If specified, user must be a member of this "
 "group to login via LDAP. If not set, everyone in LDAP that matches the user "
 "search will be able to login via Tower. Only one require group is supported."
 msgstr ""
 
-#: awx/sso/conf.py:319
+#: awx/sso/conf.py:344
 msgid "LDAP Deny Group"
 msgstr ""
 
-#: awx/sso/conf.py:320
+#: awx/sso/conf.py:345
 msgid ""
 "Group DN denied from login. If specified, user will not be allowed to login "
 "if a member of this group.  Only one deny group is supported."
 msgstr ""
 
-#: awx/sso/conf.py:333
+#: awx/sso/conf.py:358
 msgid "LDAP User Flags By Group"
 msgstr ""
 
-#: awx/sso/conf.py:334
+#: awx/sso/conf.py:359
 msgid ""
 "Retrieve users from a given group. At this time, superuser and system "
 "auditors are the only groups supported. Refer to the Ansible Tower "
 "documentation for more detail."
 msgstr ""
 
-#: awx/sso/conf.py:349
+#: awx/sso/conf.py:375
 msgid "LDAP Organization Map"
 msgstr ""
 
-#: awx/sso/conf.py:350
+#: awx/sso/conf.py:376
 msgid ""
 "Mapping between organization admins/users and LDAP groups. This controls "
 "which users are placed into which Tower organizations relative to their LDAP "
@@ -3796,237 +4277,237 @@ msgid ""
 "documentation."
 msgstr ""
 
-#: awx/sso/conf.py:377
+#: awx/sso/conf.py:403
 msgid "LDAP Team Map"
 msgstr ""
 
-#: awx/sso/conf.py:378
+#: awx/sso/conf.py:404
 msgid ""
 "Mapping between team members (users) and LDAP groups. Configuration details "
 "are available in the Ansible Tower documentation."
 msgstr ""
 
-#: awx/sso/conf.py:406
+#: awx/sso/conf.py:440
 msgid "RADIUS Server"
 msgstr ""
 
-#: awx/sso/conf.py:407
+#: awx/sso/conf.py:441
 msgid ""
 "Hostname/IP of RADIUS server. RADIUS authentication is disabled if this "
 "setting is empty."
 msgstr ""
 
-#: awx/sso/conf.py:409 awx/sso/conf.py:423 awx/sso/conf.py:435
+#: awx/sso/conf.py:443 awx/sso/conf.py:457 awx/sso/conf.py:469
 #: awx/sso/models.py:14
 msgid "RADIUS"
 msgstr ""
 
-#: awx/sso/conf.py:421
+#: awx/sso/conf.py:455
 msgid "RADIUS Port"
 msgstr ""
 
-#: awx/sso/conf.py:422
+#: awx/sso/conf.py:456
 msgid "Port of RADIUS server."
 msgstr ""
 
-#: awx/sso/conf.py:433
+#: awx/sso/conf.py:467
 msgid "RADIUS Secret"
 msgstr ""
 
-#: awx/sso/conf.py:434
+#: awx/sso/conf.py:468
 msgid "Shared secret for authenticating to RADIUS server."
 msgstr ""
 
-#: awx/sso/conf.py:450
+#: awx/sso/conf.py:484
 msgid "TACACS+ Server"
 msgstr ""
 
-#: awx/sso/conf.py:451
+#: awx/sso/conf.py:485
 msgid "Hostname of TACACS+ server."
 msgstr ""
 
-#: awx/sso/conf.py:452 awx/sso/conf.py:465 awx/sso/conf.py:478
-#: awx/sso/conf.py:491 awx/sso/conf.py:503 awx/sso/models.py:15
+#: awx/sso/conf.py:486 awx/sso/conf.py:499 awx/sso/conf.py:512
+#: awx/sso/conf.py:525 awx/sso/conf.py:537 awx/sso/models.py:15
 msgid "TACACS+"
 msgstr ""
 
-#: awx/sso/conf.py:463
+#: awx/sso/conf.py:497
 msgid "TACACS+ Port"
 msgstr ""
 
-#: awx/sso/conf.py:464
+#: awx/sso/conf.py:498
 msgid "Port number of TACACS+ server."
 msgstr ""
 
-#: awx/sso/conf.py:476
+#: awx/sso/conf.py:510
 msgid "TACACS+ Secret"
 msgstr ""
 
-#: awx/sso/conf.py:477
+#: awx/sso/conf.py:511
 msgid "Shared secret for authenticating to TACACS+ server."
 msgstr ""
 
-#: awx/sso/conf.py:489
+#: awx/sso/conf.py:523
 msgid "TACACS+ Auth Session Timeout"
 msgstr ""
 
-#: awx/sso/conf.py:490
+#: awx/sso/conf.py:524
 msgid "TACACS+ session timeout value in seconds, 0 disables timeout."
 msgstr ""
 
-#: awx/sso/conf.py:501
+#: awx/sso/conf.py:535
 msgid "TACACS+ Authentication Protocol"
 msgstr ""
 
-#: awx/sso/conf.py:502
+#: awx/sso/conf.py:536
 msgid "Choose the authentication protocol used by TACACS+ client."
 msgstr ""
 
-#: awx/sso/conf.py:517
+#: awx/sso/conf.py:551
 msgid "Google OAuth2 Callback URL"
 msgstr ""
 
-#: awx/sso/conf.py:518 awx/sso/conf.py:611 awx/sso/conf.py:676
+#: awx/sso/conf.py:552 awx/sso/conf.py:645 awx/sso/conf.py:710
 msgid ""
 "Provide this URL as the callback URL for your application as part of your "
 "registration process. Refer to the Ansible Tower documentation for more "
 "detail."
 msgstr ""
 
-#: awx/sso/conf.py:521 awx/sso/conf.py:533 awx/sso/conf.py:545
-#: awx/sso/conf.py:558 awx/sso/conf.py:572 awx/sso/conf.py:584
-#: awx/sso/conf.py:596
+#: awx/sso/conf.py:555 awx/sso/conf.py:567 awx/sso/conf.py:579
+#: awx/sso/conf.py:592 awx/sso/conf.py:606 awx/sso/conf.py:618
+#: awx/sso/conf.py:630
 msgid "Google OAuth2"
 msgstr ""
 
-#: awx/sso/conf.py:531
+#: awx/sso/conf.py:565
 msgid "Google OAuth2 Key"
 msgstr ""
 
-#: awx/sso/conf.py:532
+#: awx/sso/conf.py:566
 msgid "The OAuth2 key from your web application."
 msgstr ""
 
-#: awx/sso/conf.py:543
+#: awx/sso/conf.py:577
 msgid "Google OAuth2 Secret"
 msgstr ""
 
-#: awx/sso/conf.py:544
+#: awx/sso/conf.py:578
 msgid "The OAuth2 secret from your web application."
 msgstr ""
 
-#: awx/sso/conf.py:555
+#: awx/sso/conf.py:589
 msgid "Google OAuth2 Whitelisted Domains"
 msgstr ""
 
-#: awx/sso/conf.py:556
+#: awx/sso/conf.py:590
 msgid ""
 "Update this setting to restrict the domains who are allowed to login using "
 "Google OAuth2."
 msgstr ""
 
-#: awx/sso/conf.py:567
+#: awx/sso/conf.py:601
 msgid "Google OAuth2 Extra Arguments"
 msgstr ""
 
-#: awx/sso/conf.py:568
+#: awx/sso/conf.py:602
 msgid ""
 "Extra arguments for Google OAuth2 login. You can restrict it to only allow a "
 "single domain to authenticate, even if the user is logged in with multple "
 "Google accounts. Refer to the Ansible Tower documentation for more detail."
 msgstr ""
 
-#: awx/sso/conf.py:582
+#: awx/sso/conf.py:616
 msgid "Google OAuth2 Organization Map"
 msgstr ""
 
-#: awx/sso/conf.py:594
+#: awx/sso/conf.py:628
 msgid "Google OAuth2 Team Map"
 msgstr ""
 
-#: awx/sso/conf.py:610
+#: awx/sso/conf.py:644
 msgid "GitHub OAuth2 Callback URL"
 msgstr ""
 
-#: awx/sso/conf.py:614 awx/sso/conf.py:626 awx/sso/conf.py:637
-#: awx/sso/conf.py:649 awx/sso/conf.py:661
+#: awx/sso/conf.py:648 awx/sso/conf.py:660 awx/sso/conf.py:671
+#: awx/sso/conf.py:683 awx/sso/conf.py:695
 msgid "GitHub OAuth2"
 msgstr ""
 
-#: awx/sso/conf.py:624
+#: awx/sso/conf.py:658
 msgid "GitHub OAuth2 Key"
 msgstr ""
 
-#: awx/sso/conf.py:625
+#: awx/sso/conf.py:659
 msgid "The OAuth2 key (Client ID) from your GitHub developer application."
 msgstr ""
 
-#: awx/sso/conf.py:635
+#: awx/sso/conf.py:669
 msgid "GitHub OAuth2 Secret"
 msgstr ""
 
-#: awx/sso/conf.py:636
+#: awx/sso/conf.py:670
 msgid ""
 "The OAuth2 secret (Client Secret) from your GitHub developer application."
 msgstr ""
 
-#: awx/sso/conf.py:647
+#: awx/sso/conf.py:681
 msgid "GitHub OAuth2 Organization Map"
 msgstr ""
 
-#: awx/sso/conf.py:659
+#: awx/sso/conf.py:693
 msgid "GitHub OAuth2 Team Map"
 msgstr ""
 
-#: awx/sso/conf.py:675
+#: awx/sso/conf.py:709
 msgid "GitHub Organization OAuth2 Callback URL"
 msgstr ""
 
-#: awx/sso/conf.py:679 awx/sso/conf.py:691 awx/sso/conf.py:702
-#: awx/sso/conf.py:715 awx/sso/conf.py:726 awx/sso/conf.py:738
+#: awx/sso/conf.py:713 awx/sso/conf.py:725 awx/sso/conf.py:736
+#: awx/sso/conf.py:749 awx/sso/conf.py:760 awx/sso/conf.py:772
 msgid "GitHub Organization OAuth2"
 msgstr ""
 
-#: awx/sso/conf.py:689
+#: awx/sso/conf.py:723
 msgid "GitHub Organization OAuth2 Key"
 msgstr ""
 
-#: awx/sso/conf.py:690 awx/sso/conf.py:768
+#: awx/sso/conf.py:724 awx/sso/conf.py:802
 msgid "The OAuth2 key (Client ID) from your GitHub organization application."
 msgstr ""
 
-#: awx/sso/conf.py:700
+#: awx/sso/conf.py:734
 msgid "GitHub Organization OAuth2 Secret"
 msgstr ""
 
-#: awx/sso/conf.py:701 awx/sso/conf.py:779
+#: awx/sso/conf.py:735 awx/sso/conf.py:813
 msgid ""
 "The OAuth2 secret (Client Secret) from your GitHub organization application."
 msgstr ""
 
-#: awx/sso/conf.py:712
+#: awx/sso/conf.py:746
 msgid "GitHub Organization Name"
 msgstr ""
 
-#: awx/sso/conf.py:713
+#: awx/sso/conf.py:747
 msgid ""
 "The name of your GitHub organization, as used in your organization's URL: "
 "https://github.com/<yourorg>/."
 msgstr ""
 
-#: awx/sso/conf.py:724
+#: awx/sso/conf.py:758
 msgid "GitHub Organization OAuth2 Organization Map"
 msgstr ""
 
-#: awx/sso/conf.py:736
+#: awx/sso/conf.py:770
 msgid "GitHub Organization OAuth2 Team Map"
 msgstr ""
 
-#: awx/sso/conf.py:752
+#: awx/sso/conf.py:786
 msgid "GitHub Team OAuth2 Callback URL"
 msgstr ""
 
-#: awx/sso/conf.py:753
+#: awx/sso/conf.py:787
 msgid ""
 "Create an organization-owned application at https://github.com/organizations/"
 "<yourorg>/settings/applications and obtain an OAuth2 key (Client ID) and "
@@ -4034,170 +4515,172 @@ msgid ""
 "application."
 msgstr ""
 
-#: awx/sso/conf.py:757 awx/sso/conf.py:769 awx/sso/conf.py:780
-#: awx/sso/conf.py:793 awx/sso/conf.py:804 awx/sso/conf.py:816
+#: awx/sso/conf.py:791 awx/sso/conf.py:803 awx/sso/conf.py:814
+#: awx/sso/conf.py:827 awx/sso/conf.py:838 awx/sso/conf.py:850
 msgid "GitHub Team OAuth2"
 msgstr ""
 
-#: awx/sso/conf.py:767
+#: awx/sso/conf.py:801
 msgid "GitHub Team OAuth2 Key"
 msgstr ""
 
-#: awx/sso/conf.py:778
+#: awx/sso/conf.py:812
 msgid "GitHub Team OAuth2 Secret"
 msgstr ""
 
-#: awx/sso/conf.py:790
+#: awx/sso/conf.py:824
 msgid "GitHub Team ID"
 msgstr ""
 
-#: awx/sso/conf.py:791
+#: awx/sso/conf.py:825
 msgid ""
 "Find the numeric team ID using the Github API: http://fabian-kostadinov."
 "github.io/2015/01/16/how-to-find-a-github-team-id/."
 msgstr ""
 
-#: awx/sso/conf.py:802
+#: awx/sso/conf.py:836
 msgid "GitHub Team OAuth2 Organization Map"
 msgstr ""
 
-#: awx/sso/conf.py:814
+#: awx/sso/conf.py:848
 msgid "GitHub Team OAuth2 Team Map"
 msgstr ""
 
-#: awx/sso/conf.py:830
+#: awx/sso/conf.py:864
 msgid "Azure AD OAuth2 Callback URL"
 msgstr ""
 
-#: awx/sso/conf.py:831
+#: awx/sso/conf.py:865
 msgid ""
 "Provide this URL as the callback URL for your application as part of your "
 "registration process. Refer to the Ansible Tower documentation for more "
 "detail. "
 msgstr ""
 
-#: awx/sso/conf.py:834 awx/sso/conf.py:846 awx/sso/conf.py:857
-#: awx/sso/conf.py:869 awx/sso/conf.py:881
+#: awx/sso/conf.py:868 awx/sso/conf.py:880 awx/sso/conf.py:891
+#: awx/sso/conf.py:903 awx/sso/conf.py:915
 msgid "Azure AD OAuth2"
 msgstr ""
 
-#: awx/sso/conf.py:844
+#: awx/sso/conf.py:878
 msgid "Azure AD OAuth2 Key"
 msgstr ""
 
-#: awx/sso/conf.py:845
+#: awx/sso/conf.py:879
 msgid "The OAuth2 key (Client ID) from your Azure AD application."
 msgstr ""
 
-#: awx/sso/conf.py:855
+#: awx/sso/conf.py:889
 msgid "Azure AD OAuth2 Secret"
 msgstr ""
 
-#: awx/sso/conf.py:856
+#: awx/sso/conf.py:890
 msgid "The OAuth2 secret (Client Secret) from your Azure AD application."
 msgstr ""
 
-#: awx/sso/conf.py:867
+#: awx/sso/conf.py:901
 msgid "Azure AD OAuth2 Organization Map"
 msgstr ""
 
-#: awx/sso/conf.py:879
+#: awx/sso/conf.py:913
 msgid "Azure AD OAuth2 Team Map"
 msgstr ""
 
-#: awx/sso/conf.py:904
+#: awx/sso/conf.py:938
 msgid "SAML Assertion Consumer Service (ACS) URL"
 msgstr ""
 
-#: awx/sso/conf.py:905
+#: awx/sso/conf.py:939
 msgid ""
 "Register Tower as a service provider (SP) with each identity provider (IdP) "
 "you have configured. Provide your SP Entity ID and this ACS URL for your "
 "application."
 msgstr ""
 
-#: awx/sso/conf.py:908 awx/sso/conf.py:922 awx/sso/conf.py:936
-#: awx/sso/conf.py:951 awx/sso/conf.py:965 awx/sso/conf.py:978
-#: awx/sso/conf.py:999 awx/sso/conf.py:1017 awx/sso/conf.py:1036
-#: awx/sso/conf.py:1070 awx/sso/conf.py:1083 awx/sso/models.py:16
+#: awx/sso/conf.py:942 awx/sso/conf.py:956 awx/sso/conf.py:970
+#: awx/sso/conf.py:985 awx/sso/conf.py:999 awx/sso/conf.py:1012
+#: awx/sso/conf.py:1033 awx/sso/conf.py:1051 awx/sso/conf.py:1070
+#: awx/sso/conf.py:1106 awx/sso/conf.py:1138 awx/sso/conf.py:1152
+#: awx/sso/conf.py:1169 awx/sso/conf.py:1182 awx/sso/conf.py:1195
+#: awx/sso/conf.py:1211 awx/sso/models.py:16
 msgid "SAML"
 msgstr ""
 
-#: awx/sso/conf.py:919
+#: awx/sso/conf.py:953
 msgid "SAML Service Provider Metadata URL"
 msgstr ""
 
-#: awx/sso/conf.py:920
+#: awx/sso/conf.py:954
 msgid ""
 "If your identity provider (IdP) allows uploading an XML metadata file, you "
 "can download one from this URL."
 msgstr ""
 
-#: awx/sso/conf.py:932
+#: awx/sso/conf.py:966
 msgid "SAML Service Provider Entity ID"
 msgstr ""
 
-#: awx/sso/conf.py:933
+#: awx/sso/conf.py:967
 msgid ""
 "The application-defined unique identifier used as the audience of the SAML "
 "service provider (SP) configuration. This is usually the URL for Tower."
 msgstr ""
 
-#: awx/sso/conf.py:948
+#: awx/sso/conf.py:982
 msgid "SAML Service Provider Public Certificate"
 msgstr ""
 
-#: awx/sso/conf.py:949
+#: awx/sso/conf.py:983
 msgid ""
 "Create a keypair for Tower to use as a service provider (SP) and include the "
 "certificate content here."
 msgstr ""
 
-#: awx/sso/conf.py:962
+#: awx/sso/conf.py:996
 msgid "SAML Service Provider Private Key"
 msgstr ""
 
-#: awx/sso/conf.py:963
+#: awx/sso/conf.py:997
 msgid ""
 "Create a keypair for Tower to use as a service provider (SP) and include the "
 "private key content here."
 msgstr ""
 
-#: awx/sso/conf.py:975
+#: awx/sso/conf.py:1009
 msgid "SAML Service Provider Organization Info"
 msgstr ""
 
-#: awx/sso/conf.py:976
+#: awx/sso/conf.py:1010
 msgid ""
 "Provide the URL, display name, and the name of your app. Refer to the "
 "Ansible Tower documentation for example syntax."
 msgstr ""
 
-#: awx/sso/conf.py:995
+#: awx/sso/conf.py:1029
 msgid "SAML Service Provider Technical Contact"
 msgstr ""
 
-#: awx/sso/conf.py:996
+#: awx/sso/conf.py:1030
 msgid ""
 "Provide the name and email address of the technical contact for your service "
 "provider. Refer to the Ansible Tower documentation for example syntax."
 msgstr ""
 
-#: awx/sso/conf.py:1013
+#: awx/sso/conf.py:1047
 msgid "SAML Service Provider Support Contact"
 msgstr ""
 
-#: awx/sso/conf.py:1014
+#: awx/sso/conf.py:1048
 msgid ""
 "Provide the name and email address of the support contact for your service "
 "provider. Refer to the Ansible Tower documentation for example syntax."
 msgstr ""
 
-#: awx/sso/conf.py:1030
+#: awx/sso/conf.py:1064
 msgid "SAML Enabled Identity Providers"
 msgstr ""
 
-#: awx/sso/conf.py:1031
+#: awx/sso/conf.py:1065
 msgid ""
 "Configure the Entity ID, SSO URL and certificate for each identity provider "
 "(IdP) in use. Multiple SAML IdPs are supported. Some IdPs may provide user "
@@ -4206,126 +4689,165 @@ msgid ""
 "additional details and syntax."
 msgstr ""
 
-#: awx/sso/conf.py:1068
+#: awx/sso/conf.py:1102
+msgid "SAML Security Config"
+msgstr ""
+
+#: awx/sso/conf.py:1103
+msgid ""
+"A dict of key value pairs that are passed to the underlying python-saml "
+"security setting https://github.com/onelogin/python-saml#settings"
+msgstr ""
+
+#: awx/sso/conf.py:1135
+msgid "SAML Service Provider extra configuration data"
+msgstr ""
+
+#: awx/sso/conf.py:1136
+msgid ""
+"A dict of key value pairs to be passed to the underlying python-saml Service "
+"Provider configuration setting."
+msgstr ""
+
+#: awx/sso/conf.py:1149
+msgid "SAML IDP to extra_data attribute mapping"
+msgstr ""
+
+#: awx/sso/conf.py:1150
+msgid ""
+"A list of tuples that maps IDP attributes to extra_attributes. Each "
+"attribute will be a list of values, even if only 1 value."
+msgstr ""
+
+#: awx/sso/conf.py:1167
 msgid "SAML Organization Map"
 msgstr ""
 
-#: awx/sso/conf.py:1081
+#: awx/sso/conf.py:1180
 msgid "SAML Team Map"
 msgstr ""
 
-#: awx/sso/fields.py:123
+#: awx/sso/conf.py:1193
+msgid "SAML Organization Attribute Mapping"
+msgstr ""
+
+#: awx/sso/conf.py:1194
+msgid "Used to translate user organization membership into Tower."
+msgstr ""
+
+#: awx/sso/conf.py:1209
+msgid "SAML Team Attribute Mapping"
+msgstr ""
+
+#: awx/sso/conf.py:1210
+msgid "Used to translate user team membership into Tower."
+msgstr ""
+
+#: awx/sso/fields.py:183
 #, python-brace-format
 msgid "Invalid connection option(s): {invalid_options}."
 msgstr ""
 
-#: awx/sso/fields.py:194
+#: awx/sso/fields.py:254
 msgid "Base"
 msgstr ""
 
-#: awx/sso/fields.py:195
+#: awx/sso/fields.py:255
 msgid "One Level"
 msgstr ""
 
-#: awx/sso/fields.py:196
+#: awx/sso/fields.py:256
 msgid "Subtree"
 msgstr ""
 
-#: awx/sso/fields.py:214
+#: awx/sso/fields.py:274
 #, python-brace-format
 msgid "Expected a list of three items but got {length} instead."
 msgstr ""
 
-#: awx/sso/fields.py:215
+#: awx/sso/fields.py:275
 #, python-brace-format
 msgid "Expected an instance of LDAPSearch but got {input_type} instead."
 msgstr ""
 
-#: awx/sso/fields.py:251
+#: awx/sso/fields.py:311
 #, python-brace-format
 msgid ""
 "Expected an instance of LDAPSearch or LDAPSearchUnion but got {input_type} "
 "instead."
 msgstr ""
 
-#: awx/sso/fields.py:289
+#: awx/sso/fields.py:349
 #, python-brace-format
 msgid "Invalid user attribute(s): {invalid_attrs}."
 msgstr ""
 
-#: awx/sso/fields.py:306
+#: awx/sso/fields.py:366
 #, python-brace-format
 msgid "Expected an instance of LDAPGroupType but got {input_type} instead."
 msgstr ""
 
-#: awx/sso/fields.py:334
-#, python-brace-format
-msgid "Invalid user flag: \"{invalid_flag}\"."
-msgstr ""
-
-#: awx/sso/fields.py:350 awx/sso/fields.py:517
-#, python-brace-format
-msgid ""
-"Expected None, True, False, a string or list of strings but got {input_type} "
-"instead."
-msgstr ""
-
-#: awx/sso/fields.py:386
-#, python-brace-format
-msgid "Missing key(s): {missing_keys}."
-msgstr ""
-
-#: awx/sso/fields.py:387
+#: awx/sso/fields.py:406 awx/sso/fields.py:453
 #, python-brace-format
 msgid "Invalid key(s): {invalid_keys}."
 msgstr ""
 
-#: awx/sso/fields.py:436 awx/sso/fields.py:553
+#: awx/sso/fields.py:431
+#, python-brace-format
+msgid "Invalid user flag: \"{invalid_flag}\"."
+msgstr ""
+
+#: awx/sso/fields.py:452
+#, python-brace-format
+msgid "Missing key(s): {missing_keys}."
+msgstr ""
+
+#: awx/sso/fields.py:502 awx/sso/fields.py:619
 #, python-brace-format
 msgid "Invalid key(s) for organization map: {invalid_keys}."
 msgstr ""
 
-#: awx/sso/fields.py:454
+#: awx/sso/fields.py:520
 #, python-brace-format
 msgid "Missing required key for team map: {invalid_keys}."
 msgstr ""
 
-#: awx/sso/fields.py:455 awx/sso/fields.py:572
+#: awx/sso/fields.py:521 awx/sso/fields.py:638
 #, python-brace-format
 msgid "Invalid key(s) for team map: {invalid_keys}."
 msgstr ""
 
-#: awx/sso/fields.py:571
+#: awx/sso/fields.py:637
 #, python-brace-format
 msgid "Missing required key for team map: {missing_keys}."
 msgstr ""
 
-#: awx/sso/fields.py:589
+#: awx/sso/fields.py:655
 #, python-brace-format
 msgid "Missing required key(s) for org info record: {missing_keys}."
 msgstr ""
 
-#: awx/sso/fields.py:602
+#: awx/sso/fields.py:668
 #, python-brace-format
 msgid "Invalid language code(s) for org info: {invalid_lang_codes}."
 msgstr ""
 
-#: awx/sso/fields.py:621
+#: awx/sso/fields.py:687
 #, python-brace-format
 msgid "Missing required key(s) for contact: {missing_keys}."
 msgstr ""
 
-#: awx/sso/fields.py:633
+#: awx/sso/fields.py:699
 #, python-brace-format
 msgid "Missing required key(s) for IdP: {missing_keys}."
 msgstr ""
 
-#: awx/sso/pipeline.py:24
+#: awx/sso/pipeline.py:31
 #, python-brace-format
 msgid "An account cannot be found for {0}"
 msgstr ""
 
-#: awx/sso/pipeline.py:30
+#: awx/sso/pipeline.py:37
 msgid "Your account is inactive"
 msgstr ""
 
@@ -4352,68 +4874,48 @@ msgstr ""
 msgid "AWX"
 msgstr ""
 
-#: awx/templates/rest_framework/api.html:39
+#: awx/templates/rest_framework/api.html:42
 msgid "Ansible Tower API Guide"
 msgstr ""
 
-#: awx/templates/rest_framework/api.html:40
+#: awx/templates/rest_framework/api.html:43
 msgid "Back to Ansible Tower"
 msgstr ""
 
-#: awx/templates/rest_framework/api.html:41
+#: awx/templates/rest_framework/api.html:44
 msgid "Resize"
 msgstr ""
 
+#: awx/templates/rest_framework/base.html:37
+msgid "navbar"
+msgstr ""
+
+#: awx/templates/rest_framework/base.html:75
+msgid "content"
+msgstr ""
+
 #: awx/templates/rest_framework/base.html:78
-#: awx/templates/rest_framework/base.html:92
-#, python-format
-msgid "Make a GET request on the %(name)s resource"
+msgid "request form"
 msgstr ""
 
-#: awx/templates/rest_framework/base.html:80
-msgid "Specify a format for the GET request"
-msgstr ""
-
-#: awx/templates/rest_framework/base.html:86
-#, python-format
-msgid ""
-"Make a GET request on the %(name)s resource with the format set to `"
-"%(format)s`"
-msgstr ""
-
-#: awx/templates/rest_framework/base.html:100
-#, python-format
-msgid "Make an OPTIONS request on the %(name)s resource"
-msgstr ""
-
-#: awx/templates/rest_framework/base.html:106
-#, python-format
-msgid "Make a DELETE request on the %(name)s resource"
-msgstr ""
-
-#: awx/templates/rest_framework/base.html:113
+#: awx/templates/rest_framework/base.html:134
 msgid "Filters"
 msgstr ""
 
-#: awx/templates/rest_framework/base.html:172
-#: awx/templates/rest_framework/base.html:186
-#, python-format
-msgid "Make a POST request on the %(name)s resource"
+#: awx/templates/rest_framework/base.html:139
+msgid "main content"
 msgstr ""
 
-#: awx/templates/rest_framework/base.html:216
-#: awx/templates/rest_framework/base.html:230
-#, python-format
-msgid "Make a PUT request on the %(name)s resource"
+#: awx/templates/rest_framework/base.html:155
+msgid "request info"
 msgstr ""
 
-#: awx/templates/rest_framework/base.html:233
-#, python-format
-msgid "Make a PATCH request on the %(name)s resource"
+#: awx/templates/rest_framework/base.html:159
+msgid "response info"
 msgstr ""
 
 #: awx/ui/apps.py:9 awx/ui/conf.py:22 awx/ui/conf.py:36 awx/ui/conf.py:51
-#: awx/ui/conf.py:63
+#: awx/ui/conf.py:63 awx/ui/conf.py:73
 msgid "UI"
 msgstr ""
 
@@ -4461,12 +4963,22 @@ msgid ""
 msgstr ""
 
 #: awx/ui/conf.py:60
-msgid "Max Job Events Retreived by UI"
+msgid "Max Job Events Retrieved by UI"
 msgstr ""
 
 #: awx/ui/conf.py:61
 msgid ""
-"Maximum number of job events for the UI to retreive within a single request."
+"Maximum number of job events for the UI to retrieve within a single request."
+msgstr ""
+
+#: awx/ui/conf.py:70
+msgid "Enable Live Updates in the UI"
+msgstr ""
+
+#: awx/ui/conf.py:71
+msgid ""
+"If disabled, the page will not refresh when events are received. Reloading "
+"the page will be required to get the latest details."
 msgstr ""
 
 #: awx/ui/fields.py:29
@@ -4478,69 +4990,3 @@ msgstr ""
 #: awx/ui/fields.py:30
 msgid "Invalid base64-encoded data in data URL."
 msgstr ""
-
-#: awx/ui/templates/ui/index.html:31
-msgid ""
-"Your session will expire in <span id=\"remaining_seconds\" class=\"IdleModal-"
-"remainingSeconds\">60</span> seconds, would you like to continue?"
-msgstr ""
-
-#: awx/ui/templates/ui/index.html:46
-msgid "CANCEL"
-msgstr ""
-
-#: awx/ui/templates/ui/index.html:98
-msgid "Set how many days of data should be retained."
-msgstr ""
-
-#: awx/ui/templates/ui/index.html:104
-msgid ""
-"Please enter an integer<span ng-show=\"prompt_for_days_form.days_to_keep."
-"$dirty && prompt_for_days_form.days_to_keep.$error.min\"> that is not "
-"negative</span><span ng-show=\"prompt_for_days_form.days_to_keep.$dirty && "
-"prompt_for_days_form.days_to_keep.$error.max\"> that is lower than 9999</"
-"span>."
-msgstr ""
-
-#: awx/ui/templates/ui/index.html:109
-msgid ""
-"For facts collected older than the time period specified, save one fact scan "
-"(snapshot) per time window (frequency). For example, facts older than 30 "
-"days are purged, while one weekly fact scan is kept.\n"
-"                    <br>\n"
-"                    <br> CAUTION: Setting both numerical variables to \"0\" "
-"will delete all facts.\n"
-"                    <br>\n"
-"                    <br>"
-msgstr ""
-
-#: awx/ui/templates/ui/index.html:118
-msgid "Select a time period after which to remove old facts"
-msgstr ""
-
-#: awx/ui/templates/ui/index.html:132
-msgid ""
-"Please enter an integer<span ng-show=\"prompt_for_days_facts_form."
-"keep_amount.$dirty && prompt_for_days_facts_form.keep_amount.$error.min\"> "
-"that is not negative</span><span ng-show=\"prompt_for_days_facts_form."
-"keep_amount.$dirty && prompt_for_days_facts_form.keep_amount.$error.max\"> "
-"that is lower than 9999</span>."
-msgstr ""
-
-#: awx/ui/templates/ui/index.html:137
-msgid "Select a frequency for snapshot retention"
-msgstr ""
-
-#: awx/ui/templates/ui/index.html:151
-msgid ""
-"Please enter an integer<span ng-show=\"prompt_for_days_facts_form."
-"granularity_keep_amount.$dirty && prompt_for_days_facts_form."
-"granularity_keep_amount.$error.min\"> that is not negative</span><span ng-"
-"show=\"prompt_for_days_facts_form.granularity_keep_amount.$dirty && "
-"prompt_for_days_facts_form.granularity_keep_amount.$error.max\"> that is "
-"lower than 9999</span>."
-msgstr ""
-
-#: awx/ui/templates/ui/index.html:157
-msgid "working..."
-msgstr ""
diff --git a/awx/ui/po/ansible-tower-ui.pot b/awx/ui/po/ansible-tower-ui.pot
index 6548e36db1..ee20fdbbf5 100644
--- a/awx/ui/po/ansible-tower-ui.pot
+++ b/awx/ui/po/ansible-tower-ui.pot
@@ -4,13 +4,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Project-Id-Version: \n"
 
-#: client/src/projects/add/projects-add.controller.js:153
-#: client/src/projects/edit/projects-edit.controller.js:288
+#: client/src/projects/add/projects-add.controller.js:161
+#: client/src/projects/edit/projects-edit.controller.js:295
 msgid "%sNote:%s Mercurial does not support password authentication for SSH. Do not put the username and key in the URL. If using Bitbucket and SSH, do not supply your Bitbucket username."
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:132
-#: client/src/projects/edit/projects-edit.controller.js:267
+#: client/src/projects/add/projects-add.controller.js:140
+#: client/src/projects/edit/projects-edit.controller.js:274
 msgid "%sNote:%s When using SSH protocol for GitHub or Bitbucket, enter an SSH key only, do not enter a username (other than git). Additionally, GitHub and Bitbucket do not support password authentication when using SSH. GIT read only protocol (git://) does not use username or password information."
 msgstr ""
 
@@ -22,10 +22,6 @@ msgstr ""
 msgid "(seconds)"
 msgstr ""
 
-#: client/src/organizations/list/organizations-list.partial.html:20
-msgid "+ ADD"
-msgstr ""
-
 #: client/src/shared/paginate/paginate.partial.html:66
 msgid "100"
 msgstr ""
@@ -38,6 +34,44 @@ msgstr ""
 msgid "50"
 msgstr ""
 
+#: client/lib/components/code-mirror/code-mirror.strings.js:17
+msgid ""
+"<p>\n"
+"                Enter inventory variables using either JSON or YAML\n"
+"                syntax. Use the radio button to toggle between the two.\n"
+"            </p>\n"
+"                JSON:\n"
+"            <br/>\n"
+"            <blockquote>\n"
+"            {\n"
+"                <br/>\"somevar\": \"somevalue\",\n"
+"                <br/>\"password\": \"magic\"\n"
+"                <br/>\n"
+"            }\n"
+"            </blockquote>\n"
+"                YAML:\n"
+"            <br/>\n"
+"            <blockquote>\n"
+"                ---\n"
+"                <br/>somevar: somevalue\n"
+"                <br/>password: magic\n"
+"                <br/>\n"
+"            </blockquote>\n"
+"            <p>\n"
+"                View JSON examples at\n"
+"                <a href=\"http://www.json.org\" target=\"_blank\">www.json.org</a>\n"
+"            </p>\n"
+"            <p>\n"
+"                View YAML examples at\n"
+"                <a href=\"http://docs.ansible.com/YAMLSyntax.html\" target=\"_blank\">\n"
+"                docs.ansible.com</a>\n"
+"            </p>"
+msgstr ""
+
+#: client/features/templates/templates.strings.js:54
+msgid "<p>Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON.</p>JSON:<br /><blockquote>{<br />&quot;somevar&quot;: &quot;somevalue&quot;,<br />&quot;password&quot;: &quot;magic&quot;<br /> }</blockquote>YAML:<br /><blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>"
+msgstr ""
+
 #: client/src/management-jobs/scheduler/schedulerForm.partial.html:33
 msgid "A schedule name is required."
 msgstr ""
@@ -68,46 +102,10 @@ msgstr ""
 msgid "ACTIVITY STREAM"
 msgstr ""
 
-#: client/features/credentials/legacy.credentials.js:76
-#: client/src/credential-types/credential-types.list.js:44
-#: client/src/credentials/credentials.form.js:449
-#: client/src/credentials/credentials.list.js:54
-#: client/src/inventories-hosts/inventories/inventory.list.js:77
-#: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:71
-#: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:120
-#: client/src/inventory-scripts/inventory-scripts.list.js:42
-#: client/src/notifications/notificationTemplates.list.js:54
 #: client/src/organizations/linkout/addUsers/addUsers.partial.html:8
-#: client/src/organizations/organizations.form.js:84
-#: client/src/projects/projects.form.js:243
-#: client/src/projects/projects.list.js:78
-#: client/src/scheduler/schedules.list.js:68
-#: client/src/teams/teams.form.js:85
-#: client/src/teams/teams.list.js:45
-#: client/src/templates/job_templates/job-template.form.js:397
-#: client/src/templates/templates.list.js:58
-#: client/src/templates/workflows.form.js:125
-#: client/src/users/users.list.js:50
 msgid "ADD"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/groups/groups.list.js:71
-msgid "ADD GROUP"
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:125
-msgid "ADD HOST"
-msgstr ""
-
-#: client/src/teams/teams.form.js:157
-#: client/src/users/users.form.js:216
-msgid "ADD PERMISSIONS"
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/related/sources/sources.list.js:70
-msgid "ADD SOURCE"
-msgstr ""
-
 #: client/src/templates/survey-maker/shared/question-definition.form.js:16
 msgid "ADD SURVEY PROMPT"
 msgstr ""
@@ -116,8 +114,8 @@ msgstr ""
 msgid "ADDITIONAL INFORMATION"
 msgstr ""
 
-#: client/src/organizations/linkout/organizations-linkout.route.js:330
-#: client/src/organizations/list/organizations-list.controller.js:84
+#: client/src/organizations/linkout/organizations-linkout.route.js:258
+#: client/src/organizations/list/organizations-list.controller.js:85
 msgid "ADMINS"
 msgstr ""
 
@@ -125,12 +123,8 @@ msgstr ""
 msgid "ALL ACTIVITY"
 msgstr ""
 
-#: client/src/jobs/all-jobs.list.js:14
-msgid "ALL JOBS"
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:185
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:267
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:239
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:253
 msgid "ANY"
 msgstr ""
 
@@ -142,13 +136,13 @@ msgstr ""
 msgid "API Service/Integration Key"
 msgstr ""
 
-#: client/src/notifications/shared/type-change.service.js:52
+#: client/src/notifications/shared/type-change.service.js:60
 msgid "API Token"
 msgstr ""
 
-#: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js:53
-#: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:71
-msgid "ASSOCIATE GROUP"
+#: client/features/applications/applications.strings.js:8
+#: client/src/activity-stream/get-target-title.factory.js:47
+msgid "APPLICATIONS"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js:19
@@ -160,8 +154,12 @@ msgstr ""
 msgid "ASSOCIATED HOSTS"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:66
-msgid "About {{BRAND_NAME}}"
+#: client/lib/components/components.strings.js:78
+msgid "About"
+msgstr ""
+
+#: client/lib/components/components.strings.js:82
+msgid "Access"
 msgstr ""
 
 #: client/src/credentials/credentials.form.js:91
@@ -182,10 +180,11 @@ msgstr ""
 
 #: client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html:20
 #: client/src/inventories-hosts/hosts/hosts.partial.html:47
-#: client/src/shared/list-generator/list-generator.factory.js:573
+#: client/src/shared/list-generator/list-generator.factory.js:582
 msgid "Actions"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:15
 #: client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html:17
 #: client/src/templates/templates.list.js:36
 msgid "Activity"
@@ -195,11 +194,11 @@ msgstr ""
 msgid "Activity Stream"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:131
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:132
-#: client/src/organizations/organizations.form.js:81
-#: client/src/teams/teams.form.js:82
-#: client/src/templates/workflows.form.js:122
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:113
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:115
+#: client/src/organizations/organizations.form.js:93
+#: client/src/teams/teams.form.js:85
+#: client/src/templates/workflows.form.js:148
 msgid "Add"
 msgstr ""
 
@@ -219,9 +218,9 @@ msgstr ""
 msgid "Add Project"
 msgstr ""
 
-#: client/src/shared/form-generator.js:1711
-#: client/src/templates/job_templates/job-template.form.js:445
-#: client/src/templates/workflows.form.js:170
+#: client/src/shared/form-generator.js:1720
+#: client/src/templates/job_templates/job-template.form.js:458
+#: client/src/templates/workflows.form.js:196
 msgid "Add Survey"
 msgstr ""
 
@@ -229,7 +228,7 @@ msgstr ""
 msgid "Add Team"
 msgstr ""
 
-#: client/src/teams/teams.form.js:83
+#: client/src/teams/teams.form.js:86
 msgid "Add User"
 msgstr ""
 
@@ -239,7 +238,7 @@ msgstr ""
 msgid "Add Users"
 msgstr ""
 
-#: client/src/organizations/organizations.form.js:82
+#: client/src/organizations/organizations.form.js:94
 msgid "Add Users to this organization."
 msgstr ""
 
@@ -251,29 +250,29 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
-#: client/src/scheduler/schedules.list.js:66
+#: client/src/scheduler/schedules.list.js:74
 msgid "Add a new schedule"
 msgstr ""
 
-#: client/features/credentials/legacy.credentials.js:74
-#: client/src/credentials/credentials.form.js:447
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:133
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:134
-#: client/src/projects/projects.form.js:241
-#: client/src/templates/job_templates/job-template.form.js:395
-#: client/src/templates/workflows.form.js:123
+#: client/features/credentials/legacy.credentials.js:71
+#: client/src/credentials/credentials.form.js:448
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:115
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:117
+#: client/src/projects/projects.form.js:255
+#: client/src/templates/job_templates/job-template.form.js:406
+#: client/src/templates/workflows.form.js:149
 msgid "Add a permission"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:23
-msgid "Add passwords, SSH keys, and other credentials to use when launching jobs against machines, or when syncing inventories or projects."
-msgstr ""
-
-#: client/src/shared/form-generator.js:1446
+#: client/src/shared/form-generator.js:1455
 msgid "Admin"
 msgstr ""
 
-#: client/src/organizations/linkout/organizations-linkout.route.js:354
+#: client/lib/components/components.strings.js:83
+msgid "Administration"
+msgstr ""
+
+#: client/src/organizations/linkout/organizations-linkout.route.js:281
 msgid "Admins"
 msgstr ""
 
@@ -281,6 +280,7 @@ msgstr ""
 msgid "After every project update where the SCM revision changes, refresh the inventory from the selected source before executing job tasks. This is intended for static content, like the Ansible inventory .ini file format."
 msgstr ""
 
+#: client/lib/components/components.strings.js:90
 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:37
 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:43
 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:65
@@ -293,28 +293,28 @@ msgstr ""
 msgid "All Activity"
 msgstr ""
 
-#: client/src/portal-mode/portal-mode-jobs.partial.html:10
-#: client/src/portal-mode/portal-mode-layout.partial.html:17
+#: client/src/portal-mode/portal-mode-layout.partial.html:22
 msgid "All Jobs"
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:275
-#: client/src/templates/job_templates/job-template.form.js:282
+#: client/src/templates/job_templates/job-template.form.js:285
+#: client/src/templates/job_templates/job-template.form.js:292
 msgid "Allow Provisioning Callbacks"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:11
-msgid "Allow others to sign into {{BRAND_NAME}} and own the content they create."
-msgstr ""
-
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:43
-msgid "Always"
-msgstr ""
-
-#: client/src/projects/list/projects-list.controller.js:266
+#: client/src/projects/list/projects-list.controller.js:301
 msgid "An SCM update does not appear to be running for project: %s. Click the %sRefresh%s button to view the latest status."
 msgstr ""
 
+#: client/src/organizations/organizations.form.js:47
+#: client/src/organizations/organizations.form.js:52
+#: client/src/projects/projects.form.js:207
+#: client/src/projects/projects.form.js:212
+#: client/src/templates/job_templates/job-template.form.js:235
+#: client/src/templates/job_templates/job-template.form.js:240
+msgid "Ansible Environment"
+msgstr ""
+
 #: client/src/templates/survey-maker/shared/question-definition.form.js:62
 #: client/src/templates/survey-maker/shared/question-definition.form.js:68
 msgid "Answer Type"
@@ -325,41 +325,25 @@ msgstr ""
 msgid "Answer Variable Name"
 msgstr ""
 
-#: client/src/job-results/job-results.service.js:144
-msgid "Are you sure you want to cancel the job below?"
+#: client/lib/components/components.strings.js:76
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:24
+msgid "Applications"
 msgstr ""
 
-#: client/src/credentials/list/credentials-list.controller.js:133
-msgid "Are you sure you want to delete the credential below?"
+#: client/src/notifications/notification-templates-list/list.controller.js:219
+msgid "Are you sure you want to delete this notification template?"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:100
-msgid "Are you sure you want to delete the inventory below?"
+#: client/src/teams/list/teams-list.controller.js:80
+msgid "Are you sure you want to delete this team?"
 msgstr ""
 
-#: client/src/job-results/job-results.service.js:95
-#: client/src/jobs/factories/delete-job.factory.js:110
-msgid "Are you sure you want to delete the job below?"
+#: client/src/users/list/users-list.controller.js:93
+msgid "Are you sure you want to delete this user?"
 msgstr ""
 
-#: client/src/notifications/notification-templates-list/list.controller.js:190
-msgid "Are you sure you want to delete the notification template below?"
-msgstr ""
-
-#: client/src/organizations/list/organizations-list.controller.js:172
-msgid "Are you sure you want to delete the organization below?"
-msgstr ""
-
-#: client/src/projects/list/projects-list.controller.js:208
-msgid "Are you sure you want to delete the project below?"
-msgstr ""
-
-#: client/src/templates/list/templates-list.controller.js:103
-msgid "Are you sure you want to delete the template below?"
-msgstr ""
-
-#: client/src/users/list/users-list.controller.js:90
-msgid "Are you sure you want to delete the user below?"
+#: client/lib/services/base-string.service.js:78
+msgid "Are you sure you want to delete this {{ resourceType }}?"
 msgstr ""
 
 #: client/src/partials/survey-maker-modal.html:13
@@ -388,10 +372,14 @@ msgstr ""
 msgid "Are you sure you want to permanently delete the inventory source below from the inventory?"
 msgstr ""
 
-#: client/src/projects/edit/projects-edit.controller.js:244
+#: client/src/projects/edit/projects-edit.controller.js:251
 msgid "Are you sure you want to remove the %s below from %s?"
 msgstr ""
 
+#: client/lib/services/base-string.service.js:83
+msgid "Are you sure you want to submit the request to cancel this job?"
+msgstr ""
+
 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:39
 msgid "Arguments"
 msgstr ""
@@ -403,6 +391,10 @@ msgstr ""
 msgid "Ask at runtime?"
 msgstr ""
 
+#: client/src/instance-groups/instance-groups.strings.js:24
+msgid "Associate an existing Instance"
+msgstr ""
+
 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:69
 msgid "Associate an existing group"
 msgstr ""
@@ -411,7 +403,7 @@ msgstr ""
 msgid "Associate this host with a new group"
 msgstr ""
 
-#: client/src/shared/form-generator.js:1448
+#: client/src/shared/form-generator.js:1457
 msgid "Auditor"
 msgstr ""
 
@@ -435,24 +427,24 @@ msgstr ""
 msgid "Authorize Password"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:172
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:253
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:226
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:239
 msgid "Availability Zone:"
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:106
+#: client/src/configuration/auth-form/configuration-auth.controller.js:125
 msgid "Azure AD"
 msgstr ""
 
-#: client/src/shared/directives.js:75
+#: client/src/shared/directives.js:91
 msgid "BROWSE"
 msgstr ""
 
-#: client/src/projects/projects.form.js:80
+#: client/src/projects/projects.form.js:81
 msgid "Base path used for locating playbooks. Directories found inside this path will be listed in the playbook directory drop-down. Together the base path and selected playbook directory provide the full path used to locate playbooks."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:128
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:129
 msgid "Become Privilege Escalation"
 msgstr ""
 
@@ -460,7 +452,15 @@ msgstr ""
 msgid "Browse"
 msgstr ""
 
-#: client/lib/services/base-string.service.js:61
+#: client/src/license/license.partial.html:129
+msgid ""
+"By default, Tower collects and transmits analytics data on Tower usage to Red Hat. This data is used to enhance future releases of the Tower Software and help streamline customer experience and success. For more information, see\n"
+"\t\t\t\t\t\t\t\t\t\t<a target=\"_blank\" href=\"http://docs.ansible.com/ansible-tower/latest/html/installandreference/user-data.html#index-0\">\n"
+"\t\t\t\t\t\t\t\t\t\t\t\tthis Tower documentation page\n"
+"\t\t\t\t\t\t\t\t\t\t</a>.  Uncheck this box to disable this feature."
+msgstr ""
+
+#: client/lib/services/base-string.service.js:60
 #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:28
 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:51
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:29
@@ -474,14 +474,18 @@ msgstr ""
 #: client/src/partials/survey-maker-modal.html:17
 #: client/src/partials/survey-maker-modal.html:85
 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:17
-#: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:65
+#: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:78
 msgid "CANCEL"
 msgstr ""
 
-#: client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html:20
+#: client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html:28
 msgid "CHANGES"
 msgstr ""
 
+#: client/lib/components/components.strings.js:20
+msgid "CHOOSE A FILE"
+msgstr ""
+
 #: client/src/shared/smart-search/smart-search.partial.html:30
 msgid "CLEAR ALL"
 msgstr ""
@@ -490,20 +494,34 @@ msgstr ""
 msgid "CLOSE"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:19
-#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js:19
-#: client/src/templates/completed-jobs.list.js:20
+#: client/features/jobs/routes/templateCompletedJobs.route.js:21
 msgid "COMPLETED JOBS"
 msgstr ""
 
 #: client/src/configuration/configuration.partial.html:10
-msgid "CONFIGURE {{BRAND_NAME}}"
+msgid "CONFIGURE {{ BRAND_NAME }}"
+msgstr ""
+
+#: client/features/templates/templates.strings.js:30
+msgid "CONFIRM"
+msgstr ""
+
+#: client/lib/services/base-string.service.js:71
+msgid "COPY"
+msgstr ""
+
+#: client/features/users/tokens/tokens.strings.js:25
+msgid "COULD NOT CREATE TOKEN"
 msgstr ""
 
 #: client/src/shared/stateDefinitions.factory.js:157
 msgid "CREATE %s"
 msgstr ""
 
+#: client/features/applications/applications.strings.js:9
+msgid "CREATE APPLICATION"
+msgstr ""
+
 #: client/features/credentials/credentials.strings.js:8
 #: client/src/credentials/credentials.form.js:16
 msgid "CREATE CREDENTIAL"
@@ -524,14 +542,18 @@ msgstr ""
 msgid "CREATE HOST"
 msgstr ""
 
+#: client/src/instance-groups/instance-groups.strings.js:8
+msgid "CREATE INSTANCE GROUP"
+msgstr ""
+
 #: client/src/inventories-hosts/inventories/related/sources/add/sources-add.route.js:8
 msgid "CREATE INVENTORY SOURCE"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-add.route.js:8
-#: client/src/scheduler/main.js:113
-#: client/src/scheduler/main.js:206
-#: client/src/scheduler/main.js:290
+#: client/src/scheduler/main.js:109
+#: client/src/scheduler/main.js:200
+#: client/src/scheduler/main.js:284
 msgid "CREATE SCHEDULE"
 msgstr ""
 
@@ -543,10 +565,14 @@ msgstr ""
 msgid "CREATE SOURCE"
 msgstr ""
 
+#: client/features/users/tokens/tokens.strings.js:18
+#: client/features/users/tokens/tokens.strings.js:9
+#: client/features/users/tokens/users-tokens-add.route.js:25
+msgid "CREATE TOKEN"
+msgstr ""
+
 #: client/src/job-submission/job-submission.partial.html:351
 #: client/src/partials/job-template-details.html:2
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:93
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:82
 msgid "CREDENTIAL"
 msgstr ""
 
@@ -555,17 +581,17 @@ msgid "CREDENTIAL TYPE"
 msgstr ""
 
 #: client/src/job-submission/job-submission.partial.html:92
-#: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:56
+#: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:70
 msgid "CREDENTIAL TYPE:"
 msgstr ""
 
 #: client/src/activity-stream/get-target-title.factory.js:11
 #: client/src/credential-types/credential-types.list.js:12
-#: client/src/credential-types/main.js:45
+#: client/src/credential-types/main.js:44
 msgid "CREDENTIAL TYPES"
 msgstr ""
 
-#: client/features/credentials/legacy.credentials.js:14
+#: client/features/credentials/legacy.credentials.js:11
 #: client/src/activity-stream/get-target-title.factory.js:17
 #: client/src/credentials/credentials.list.js:15
 #: client/src/credentials/credentials.list.js:16
@@ -573,35 +599,35 @@ msgstr ""
 msgid "CREDENTIALS"
 msgstr ""
 
-#: client/features/credentials/credentials.strings.js:28
+#: client/features/credentials/credentials.strings.js:30
 msgid "CREDENTIALS PERMISSIONS"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:378
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:390
-#: client/src/projects/projects.form.js:199
+#: client/src/projects/projects.form.js:200
 msgid "Cache Timeout"
 msgstr ""
 
-#: client/src/projects/projects.form.js:188
+#: client/src/projects/projects.form.js:189
 msgid "Cache Timeout%s (seconds)%s"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:199
-#: client/src/users/list/users-list.controller.js:83
+#: client/src/projects/list/projects-list.controller.js:214
+#: client/src/users/list/users-list.controller.js:85
 msgid "Call to %s failed. DELETE returned status:"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:246
-#: client/src/projects/list/projects-list.controller.js:263
+#: client/src/projects/list/projects-list.controller.js:281
+#: client/src/projects/list/projects-list.controller.js:298
 msgid "Call to %s failed. GET status:"
 msgstr ""
 
-#: client/src/projects/edit/projects-edit.controller.js:238
+#: client/src/projects/edit/projects-edit.controller.js:245
 msgid "Call to %s failed. POST returned status:"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:225
+#: client/src/projects/list/projects-list.controller.js:260
 msgid "Call to %s failed. POST status:"
 msgstr ""
 
@@ -609,57 +635,53 @@ msgstr ""
 msgid "Call to %s failed. Return status: %d"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:272
+#: client/src/projects/list/projects-list.controller.js:307
 msgid "Call to get project failed. GET status:"
 msgstr ""
 
+#: client/lib/services/base-string.service.js:90
+msgid "Call to {{ path }} failed. {{ action }} returned status: {{ status }}."
+msgstr ""
+
+#: client/features/output/details.partial.html:17
+#: client/lib/services/base-string.service.js:82
 #: client/src/access/add-rbac-resource/rbac-resource.partial.html:105
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:188
-#: client/src/configuration/configuration.controller.js:541
-#: client/src/job-results/job-results.partial.html:42
-#: client/src/jobs/factories/delete-job.factory.js:33
-#: client/src/shared/form-generator.js:1699
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:12
+#: client/src/configuration/configuration.controller.js:594
+#: client/src/shared/form-generator.js:1708
 #: client/src/workflow-results/workflow-results.partial.html:42
 msgid "Cancel"
 msgstr ""
 
-#: client/src/job-results/job-results.service.js:142
+#: client/lib/services/base-string.service.js:84
 msgid "Cancel Job"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:241
+#: client/src/projects/list/projects-list.controller.js:276
 msgid "Cancel Not Allowed"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/sources.list.js:93
+#: client/src/inventories-hosts/inventories/related/sources/sources.list.js:100
 msgid "Cancel sync process"
 msgstr ""
 
-#: client/src/projects/projects.list.js:124
+#: client/src/projects/projects.list.js:131
 msgid "Cancel the SCM update"
 msgstr ""
 
-#: client/src/jobs/all-jobs.list.js:106
-msgid "Cancel the job"
-msgstr ""
-
-#: client/src/projects/factories/get-project-tool-tip.factory.js:30
-#: client/src/projects/list/projects-list.controller.js:79
+#: client/src/projects/list/projects-list.controller.js:81
 msgid "Canceled. Click for details"
 msgstr ""
 
-#: client/src/shared/smart-search/smart-search.controller.js:49
-#: client/src/shared/smart-search/smart-search.controller.js:91
+#: client/src/shared/smart-search/smart-search.controller.js:106
 msgid "Cannot search running job"
 msgstr ""
 
 #: client/src/instance-groups/instance-groups.list.js:22
-#: client/src/instance-groups/instances/instances.list.js:20
 msgid "Capacity"
 msgstr ""
 
-#: client/src/projects/projects.form.js:82
+#: client/src/projects/projects.form.js:83
 msgid "Change %s under \"Configure {{BRAND_NAME}}\" to change this location."
 msgstr ""
 
@@ -667,10 +689,26 @@ msgstr ""
 msgid "Changes"
 msgstr ""
 
-#: client/src/shared/form-generator.js:1071
+#: client/src/notifications/notificationTemplates.form.js:355
+msgid "Channel"
+msgstr ""
+
+#: client/features/templates/templates.strings.js:60
+msgid "Check"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1080
 msgid "Choose a %s"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:51
+msgid "Choose a job type"
+msgstr ""
+
+#: client/features/templates/templates.strings.js:52
+msgid "Choose a verbosity"
+msgstr ""
+
 #: client/src/templates/survey-maker/shared/question-definition.form.js:64
 msgid "Choose an answer type"
 msgstr ""
@@ -683,7 +721,7 @@ msgstr ""
 msgid "Choose an inventory file"
 msgstr ""
 
-#: client/src/shared/directives.js:76
+#: client/src/shared/directives.js:92
 msgid "Choose file"
 msgstr ""
 
@@ -691,7 +729,7 @@ msgstr ""
 msgid "Choose your license file, agree to the End User License Agreement, and click submit."
 msgstr ""
 
-#: client/src/projects/projects.form.js:156
+#: client/src/projects/projects.form.js:157
 msgid "Clean"
 msgstr ""
 
@@ -700,11 +738,10 @@ msgid "Clear"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js:64
-#: client/src/job-results/parse-stdout.service.js:68
 msgid "Click for details"
 msgstr ""
 
-#: client/src/templates/workflows/edit-workflow/workflow-edit.controller.js:63
+#: client/src/templates/workflows/edit-workflow/workflow-edit.controller.js:261
 msgid "Click here to open the workflow graph editor."
 msgstr ""
 
@@ -736,14 +773,10 @@ msgstr ""
 msgid "Client Secret"
 msgstr ""
 
-#: client/src/shared/form-generator.js:1703
+#: client/src/shared/form-generator.js:1712
 msgid "Close"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:291
-msgid "Cloud Credential"
-msgstr ""
-
 #: client/src/inventories-hosts/inventories/related/sources/factories/get-sync-status-msg.factory.js:26
 msgid "Cloud source not configured."
 msgstr ""
@@ -757,14 +790,18 @@ msgstr ""
 msgid "CloudForms URL"
 msgstr ""
 
-#: client/src/job-results/job-results.controller.js:226
-#: client/src/standard-out/standard-out.controller.js:243
+#: client/features/output/jobs.strings.js:29
 #: client/src/workflow-results/workflow-results.controller.js:118
 msgid "Collapse Output"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:13
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:21
+#: client/src/network-ui/network-nav/network.nav.strings.js:13
+msgid "Collapse Panel"
+msgstr ""
+
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:155
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:172
+#: client/src/templates/job_templates/job-template.form.js:438
 msgid "Completed Jobs"
 msgstr ""
 
@@ -772,40 +809,32 @@ msgstr ""
 msgid "Configure Notifications"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:60
-msgid "Configure {{BRAND_NAME}}"
-msgstr ""
-
-#: client/src/users/users.form.js:81
+#: client/src/users/users.form.js:84
 msgid "Confirm Password"
 msgstr ""
 
-#: client/src/configuration/configuration.controller.js:548
+#: client/src/configuration/configuration.controller.js:601
 msgid "Confirm Reset"
 msgstr ""
 
-#: client/src/configuration/configuration.controller.js:557
+#: client/src/configuration/configuration.controller.js:610
 msgid "Confirm factory reset"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:120
-msgid "Confirm that you want to permanently delete the inventory source below from the inventory. Deleting this inventory source also deletes its associated groups and hosts."
-msgstr ""
-
 #: client/src/inventories-hosts/inventories/related/hosts/related-groups-labels/relatedGroupsLabelsList.directive.js:82
 msgid "Confirm the removal of the"
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:134
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:149
-msgid "Consult the Ansible documentation for further details on the usage of tags."
+#: client/src/teams/teams.form.js:24
+#: client/src/users/users.form.js:25
+msgid "Contact your System Administrator to grant you the appropriate permissions to add and edit Users and Teams."
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/groups/factories/get-hosts-status-msg.factory.js:18
 msgid "Contains 0 hosts."
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:180
+#: client/src/templates/job_templates/job-template.form.js:179
 msgid "Control the level of output ansible will produce as the playbook executes."
 msgstr ""
 
@@ -813,32 +842,73 @@ msgstr ""
 msgid "Control the level of output ansible will produce for inventory source update jobs."
 msgstr ""
 
-#: client/lib/components/components.strings.js:48
+#: client/lib/components/components.strings.js:52
 msgid "Copied to clipboard."
 msgstr ""
 
-#: client/src/templates/templates.list.js:95
+#: client/src/credentials/credentials.list.js:73
+#: client/src/inventories-hosts/inventories/inventory.list.js:111
+#: client/src/inventory-scripts/inventory-scripts.list.js:61
+#: client/src/notifications/notificationTemplates.list.js:82
+#: client/src/projects/projects.list.js:109
+#: client/src/templates/templates.list.js:100
 msgid "Copy"
 msgstr ""
 
-#: client/lib/components/components.strings.js:47
+#: client/features/templates/templates.strings.js:76
+msgid "Copy Workflow"
+msgstr ""
+
+#: client/src/credentials/credentials.list.js:76
+msgid "Copy credential"
+msgstr ""
+
+#: client/lib/components/components.strings.js:51
 msgid "Copy full revision to clipboard."
 msgstr ""
 
-#: client/src/templates/templates.list.js:98
+#: client/src/inventories-hosts/inventories/inventory.list.js:114
+msgid "Copy inventory"
+msgstr ""
+
+#: client/src/inventory-scripts/inventory-scripts.list.js:64
+msgid "Copy inventory script"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.list.js:85
+msgid "Copy notification"
+msgstr ""
+
+#: client/src/projects/projects.list.js:112
+msgid "Copy project"
+msgstr ""
+
+#: client/src/templates/templates.list.js:103
 msgid "Copy template"
 msgstr ""
 
 #: client/src/about/about.partial.html:27
 msgid ""
-"Copyright &copy; 2017 Red Hat, Inc. <br>\n"
+"Copyright &copy; 2018 Red Hat, Inc. <br>\n"
 "                          Visit <a href=\"http://www.ansible.com/\" target=\"_blank\">Ansible.com</a> for more information.<br>"
 msgstr ""
 
+#: client/lib/components/components.strings.js:79
+msgid "Copyright © 2018 Red Hat, Inc."
+msgstr ""
+
 #: client/src/users/users.list.js:44
 msgid "Create New"
 msgstr ""
 
+#: client/features/applications/applications.strings.js:20
+msgid "Create a new Application"
+msgstr ""
+
+#: client/src/instance-groups/instance-groups.strings.js:23
+msgid "Create a new Instance Group"
+msgstr ""
+
 #: client/src/credentials/credentials.list.js:52
 msgid "Create a new credential"
 msgstr ""
@@ -891,53 +961,47 @@ msgstr ""
 msgid "Create a new user"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:42
-msgid "Create and edit scripts to dynamically load hosts from any source."
-msgstr ""
-
-#: client/src/setup-menu/setup-menu.partial.html:30
-msgid "Create custom credential types to be used for authenticating to network hosts and cloud sources"
-msgstr ""
-
-#: client/src/setup-menu/setup-menu.partial.html:49
-msgid "Create templates for sending notifications with Email, HipChat, Slack, and SMS."
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:72
+#: client/features/templates/templates.strings.js:25
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:73
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:74
 #: client/src/job-submission/job-submission.partial.html:18
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:67
 #: client/src/templates/job_templates/job-template.form.js:121
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:53
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:62
 msgid "Credential"
 msgstr ""
 
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:32
-#: client/src/setup-menu/setup-menu.partial.html:29
+#: client/features/templates/templates.strings.js:35
+msgid "Credential Type"
+msgstr ""
+
+#: client/lib/components/components.strings.js:65
+#: client/lib/models/models.strings.js:12
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:33
 msgid "Credential Types"
 msgstr ""
 
+#: client/features/jobs/jobs.strings.js:15
+#: client/features/templates/templates.strings.js:18
+#: client/lib/components/components.strings.js:64
+#: client/lib/models/models.strings.js:8
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:129
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:58
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:24
-#: client/src/setup-menu/setup-menu.partial.html:22
-#: client/src/templates/job_templates/job-template.form.js:134
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:25
+#: client/src/templates/job_templates/job-template.form.js:133
 msgid "Credentials"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:36
+msgid "Credentials that require passwords on launch are not permitted for template schedules and workflow nodes.  The following credentials must be removed or replaced to proceed:"
+msgstr ""
+
 #: client/src/inventories-hosts/inventories/insights/insights.partial.html:17
 msgid "Critical"
 msgstr ""
 
-#: client/src/shared/directives.js:77
+#: client/src/shared/directives.js:93
 msgid "Current Image:"
 msgstr ""
 
-#: client/src/job-results/job-results.controller.js:271
-msgid "Currently following standard out as it comes in.  Click to unfollow."
-msgstr ""
-
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:171
 msgid "Custom Inventory Script"
 msgstr ""
@@ -951,19 +1015,16 @@ msgstr ""
 msgid "DASHBOARD"
 msgstr ""
 
-#: client/src/credentials/list/credentials-list.controller.js:135
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:103
+#: client/features/users/tokens/tokens.strings.js:28
+#: client/lib/services/base-string.service.js:70
 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:52
-#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:178
 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.partial.html:74
-#: client/src/job-results/job-results.service.js:119
-#: client/src/jobs/factories/delete-job.factory.js:115
-#: client/src/notifications/notification-templates-list/list.controller.js:195
-#: client/src/organizations/list/organizations-list.controller.js:174
+#: client/src/notifications/notification-templates-list/list.controller.js:221
+#: client/src/organizations/list/organizations-list.controller.js:196
 #: client/src/partials/survey-maker-modal.html:18
-#: client/src/projects/edit/projects-edit.controller.js:246
-#: client/src/templates/list/templates-list.controller.js:154
-#: client/src/users/list/users-list.controller.js:92
+#: client/src/projects/edit/projects-edit.controller.js:253
+#: client/src/projects/list/projects-list.controller.js:244
+#: client/src/users/list/users-list.controller.js:95
 msgid "DELETE"
 msgstr ""
 
@@ -971,10 +1032,19 @@ msgstr ""
 msgid "DELETE SURVEY"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:16
+#: client/features/users/tokens/tokens.strings.js:35
+msgid "DESCRIPTION"
+msgstr ""
+
+#: client/features/output/details.partial.html:3
+#: client/src/instance-groups/instance-groups.strings.js:17
 msgid "DETAILS"
 msgstr ""
 
+#: client/src/network-ui/network-details/details.partial.html:2
+msgid "DETAILS <span ng-if=\"!item.host_id && item.name\">| {{item.name}}</span>"
+msgstr ""
+
 #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.partial.html:29
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:30
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts-disassociate.partial.html:30
@@ -986,24 +1056,33 @@ msgstr ""
 msgid "DYNAMIC HOSTS"
 msgstr ""
 
+#: client/lib/components/components.strings.js:59
+msgid "Dashboard"
+msgstr ""
+
+#: client/src/configuration/auth-form/configuration-auth.controller.js:137
+msgid "Default"
+msgstr ""
+
+#: client/features/output/details.partial.html:34
+#: client/lib/services/base-string.service.js:75
 #: client/src/credential-types/credential-types.list.js:73
-#: client/src/credentials/credentials.list.js:85
-#: client/src/credentials/list/credentials-list.controller.js:132
-#: client/src/inventories-hosts/inventories/inventory.list.js:111
-#: client/src/inventory-scripts/inventory-scripts.list.js:71
-#: client/src/job-results/job-results.partial.html:54
-#: client/src/jobs/factories/delete-job.factory.js:37
-#: client/src/notifications/notification-templates-list/list.controller.js:192
-#: client/src/notifications/notificationTemplates.list.js:91
-#: client/src/organizations/list/organizations-list.controller.js:171
-#: client/src/projects/edit/projects-edit.controller.js:243
-#: client/src/projects/list/projects-list.controller.js:207
-#: client/src/scheduler/schedules.list.js:90
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:13
+#: client/src/credential-types/list/list.controller.js:106
+#: client/src/credentials/credentials.list.js:92
+#: client/src/credentials/list/credentials-list.controller.js:164
+#: client/src/inventories-hosts/inventories/inventory.list.js:126
+#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:139
+#: client/src/inventory-scripts/inventory-scripts.list.js:79
+#: client/src/inventory-scripts/list/list.controller.js:114
+#: client/src/notifications/notification-templates-list/list.controller.js:217
+#: client/src/notifications/notificationTemplates.list.js:100
+#: client/src/organizations/list/organizations-list.controller.js:192
+#: client/src/projects/edit/projects-edit.controller.js:250
+#: client/src/projects/list/projects-list.controller.js:240
+#: client/src/scheduler/schedules.list.js:98
 #: client/src/teams/teams.list.js:72
-#: client/src/templates/list/templates-list.controller.js:102
-#: client/src/templates/templates.list.js:120
-#: client/src/users/list/users-list.controller.js:89
+#: client/src/templates/templates.list.js:116
+#: client/src/users/list/users-list.controller.js:91
 #: client/src/users/users.list.js:79
 #: client/src/workflow-results/workflow-results.partial.html:54
 msgid "Delete"
@@ -1014,15 +1093,11 @@ msgstr ""
 msgid "Delete Group"
 msgstr ""
 
-#: client/src/job-results/job-results.service.js:93
-msgid "Delete Job"
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:175
+#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:195
 msgid "Delete Source"
 msgstr ""
 
-#: client/src/credentials/credentials.list.js:87
+#: client/src/credentials/credentials.list.js:94
 msgid "Delete credential"
 msgstr ""
 
@@ -1056,19 +1131,19 @@ msgstr[1] ""
 msgid "Delete hosts"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/inventory.list.js:113
+#: client/src/inventories-hosts/inventories/inventory.list.js:128
 msgid "Delete inventory"
 msgstr ""
 
-#: client/src/inventory-scripts/inventory-scripts.list.js:73
+#: client/src/inventory-scripts/inventory-scripts.list.js:81
 msgid "Delete inventory script"
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.list.js:93
+#: client/src/notifications/notificationTemplates.list.js:102
 msgid "Delete notification"
 msgstr ""
 
-#: client/src/projects/projects.form.js:166
+#: client/src/projects/projects.form.js:167
 msgid "Delete on Update"
 msgstr ""
 
@@ -1077,7 +1152,7 @@ msgstr ""
 msgid "Delete or promote the group's children?"
 msgstr ""
 
-#: client/src/scheduler/schedules.list.js:93
+#: client/src/scheduler/schedules.list.js:101
 msgid "Delete schedule"
 msgstr ""
 
@@ -1089,21 +1164,15 @@ msgstr ""
 msgid "Delete team"
 msgstr ""
 
-#: client/src/templates/templates.list.js:123
+#: client/src/templates/templates.list.js:119
 msgid "Delete template"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:84
-#: client/src/jobs/all-jobs.list.js:113
-#: client/src/templates/completed-jobs.list.js:85
-msgid "Delete the job"
-msgstr ""
-
-#: client/src/projects/projects.form.js:168
+#: client/src/projects/projects.form.js:169
 msgid "Delete the local repository in its entirety prior to performing an update."
 msgstr ""
 
-#: client/src/projects/projects.list.js:118
+#: client/src/projects/projects.list.js:125
 msgid "Delete the project"
 msgstr ""
 
@@ -1123,12 +1192,16 @@ msgstr ""
 msgid "Deleting group"
 msgstr ""
 
-#: client/src/projects/projects.form.js:168
+#: client/lib/services/base-string.service.js:77
+msgid "Deleting this {{ resourceType }} will make the following resources unavailable."
+msgstr ""
+
+#: client/src/projects/projects.form.js:169
 msgid "Depending on the size of the repository this may significantly increase the amount of time required to complete an update."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:192
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:274
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:246
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:260
 msgid "Describe Instances documentation"
 msgstr ""
 
@@ -1140,18 +1213,19 @@ msgstr ""
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:62
 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:62
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:58
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:46
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:53
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:28
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:36
 #: client/src/inventory-scripts/inventory-scripts.form.js:35
+#: client/src/network-ui/network-details/details.partial.html:26
 #: client/src/notifications/notificationTemplates.form.js:39
 #: client/src/organizations/organizations.form.js:33
-#: client/src/projects/projects.form.js:36
-#: client/src/teams/teams.form.js:32
+#: client/src/projects/projects.form.js:37
+#: client/src/teams/teams.form.js:35
 #: client/src/templates/job_templates/job-template.form.js:41
 #: client/src/templates/survey-maker/shared/question-definition.form.js:36
-#: client/src/templates/workflows.form.js:39
-#: client/src/users/users.form.js:145
-#: client/src/users/users.form.js:171
+#: client/src/templates/workflows.form.js:49
+#: client/src/users/users.form.js:148
+#: client/src/users/users.form.js:174
 msgid "Description"
 msgstr ""
 
@@ -1162,8 +1236,8 @@ msgstr ""
 msgid "Destination Channels"
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.form.js:359
-#: client/src/notifications/notificationTemplates.form.js:363
+#: client/src/notifications/notificationTemplates.form.js:430
+#: client/src/notifications/notificationTemplates.form.js:434
 msgid "Destination Channels or Users"
 msgstr ""
 
@@ -1172,9 +1246,11 @@ msgstr ""
 msgid "Destination SMS Number"
 msgstr ""
 
+#: client/features/applications/applications.strings.js:15
 #: client/features/credentials/credentials.strings.js:13
+#: client/features/users/tokens/tokens.strings.js:14
 #: client/src/license/license.partial.html:5
-#: client/src/shared/form-generator.js:1481
+#: client/src/shared/form-generator.js:1490
 msgid "Details"
 msgstr ""
 
@@ -1182,6 +1258,11 @@ msgstr ""
 msgid "Diff Mode"
 msgstr ""
 
+#: client/src/notifications/notificationTemplates.form.js:369
+#: client/src/notifications/notificationTemplates.form.js:401
+msgid "Disable SSL Verification"
+msgstr ""
+
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups-disassociate.partial.html:6
 msgid "Disassociate Group From Group"
 msgstr ""
@@ -1205,18 +1286,18 @@ msgstr ""
 msgid "Disassociate host"
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:75
-#: client/src/configuration/configuration.controller.js:202
-#: client/src/configuration/configuration.controller.js:264
+#: client/src/configuration/auth-form/configuration-auth.controller.js:93
+#: client/src/configuration/configuration.controller.js:231
+#: client/src/configuration/configuration.controller.js:311
 #: client/src/configuration/system-form/configuration-system.controller.js:57
 msgid "Discard changes"
 msgstr ""
 
-#: client/src/teams/teams.form.js:146
+#: client/src/teams/teams.form.js:149
 msgid "Dissasociate permission from team"
 msgstr ""
 
-#: client/src/users/users.form.js:225
+#: client/src/users/users.form.js:228
 msgid "Dissasociate permission from user"
 msgstr ""
 
@@ -1226,13 +1307,6 @@ msgstr ""
 msgid "Domain Name"
 msgstr ""
 
-#: client/src/job-results/job-results.controller.js:15
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:134
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:141
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:102
-msgid "Download Output"
-msgstr ""
-
 #: client/src/inventory-scripts/inventory-scripts.form.js:59
 msgid "Drag and drop your custom inventory script file here or create one in the field to import your custom inventory. Refer to the Ansible Tower documentation for example syntax."
 msgstr ""
@@ -1241,7 +1315,11 @@ msgstr ""
 msgid "Drop question here to reorder"
 msgstr ""
 
-#: client/src/configuration/configuration.route.js:30
+#: client/features/applications/applications.strings.js:10
+msgid "EDIT APPLICATION"
+msgstr ""
+
+#: client/src/configuration/configuration.route.js:28
 msgid "EDIT CONFIGURATION"
 msgstr ""
 
@@ -1249,6 +1327,10 @@ msgstr ""
 msgid "EDIT CREDENTIAL"
 msgstr ""
 
+#: client/src/instance-groups/instance-groups.strings.js:9
+msgid "EDIT INSTANCE GROUP"
+msgstr ""
+
 #: client/src/management-jobs/scheduler/main.js:95
 msgid "EDIT SCHEDULED JOB"
 msgstr ""
@@ -1257,12 +1339,6 @@ msgstr ""
 msgid "EDIT SURVEY PROMPT"
 msgstr ""
 
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:46
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:79
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:59
-msgid "ELAPSED"
-msgstr ""
-
 #: client/lib/components/components.strings.js:9
 msgid "ENCRYPTED"
 msgstr ""
@@ -1275,34 +1351,48 @@ msgstr ""
 msgid "EXECUTE COMMAND"
 msgstr ""
 
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:46
-msgid "EXPLANATION"
+#: client/lib/components/code-mirror/code-mirror.strings.js:10
+msgid "EXPAND"
+msgstr ""
+
+#: client/features/applications/applications.strings.js:28
+#: client/features/users/tokens/tokens.strings.js:36
+msgid "EXPIRATION"
+msgstr ""
+
+#: client/features/users/tokens/tokens.strings.js:24
+msgid "EXPIRES"
+msgstr ""
+
+#: client/lib/components/code-mirror/code-mirror.strings.js:48
+#: client/lib/components/code-mirror/code-mirror.strings.js:8
+msgid "EXTRA VARIABLES"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:355
 msgid "Each time a job runs using this inventory, refresh the inventory from the selected source before executing job tasks."
 msgstr ""
 
-#: client/src/projects/projects.form.js:179
-msgid "Each time a job runs using this project, perform an update to the local repository prior to starting the job."
+#: client/src/projects/projects.form.js:180
+msgid "Each time a job runs using this project, update the revision of the project prior to starting the job."
 msgstr ""
 
 #: client/src/credential-types/credential-types.list.js:56
 #: client/src/credentials/credentials.list.js:66
 #: client/src/inventories-hosts/inventories/inventory.list.js:97
 #: client/src/inventory-scripts/inventory-scripts.list.js:54
-#: client/src/notifications/notificationTemplates.list.js:65
-#: client/src/notifications/notificationTemplates.list.js:74
-#: client/src/scheduler/schedules.list.js:75
+#: client/src/notifications/notificationTemplates.list.js:66
+#: client/src/notifications/notificationTemplates.list.js:75
+#: client/src/scheduler/schedules.list.js:83
 #: client/src/teams/teams.list.js:55
-#: client/src/templates/templates.list.js:103
+#: client/src/templates/templates.list.js:80
 #: client/src/users/users.list.js:60
 msgid "Edit"
 msgstr ""
 
-#: client/src/shared/form-generator.js:1715
-#: client/src/templates/job_templates/job-template.form.js:452
-#: client/src/templates/workflows.form.js:177
+#: client/src/shared/form-generator.js:1724
+#: client/src/templates/job_templates/job-template.form.js:465
+#: client/src/templates/workflows.form.js:203
 msgid "Edit Survey"
 msgstr ""
 
@@ -1322,7 +1412,7 @@ msgstr ""
 
 #: client/src/inventories-hosts/hosts/host.list.js:83
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:73
-#: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:87
+#: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:79
 msgid "Edit host"
 msgstr ""
 
@@ -1334,15 +1424,15 @@ msgstr ""
 msgid "Edit inventory script"
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.list.js:76
+#: client/src/notifications/notificationTemplates.list.js:68
 msgid "Edit notification"
 msgstr ""
 
-#: client/src/scheduler/schedules.list.js:78
+#: client/src/scheduler/schedules.list.js:86
 msgid "Edit schedule"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/sources.list.js:111
+#: client/src/inventories-hosts/inventories/related/sources/sources.list.js:83
 msgid "Edit source"
 msgstr ""
 
@@ -1350,37 +1440,15 @@ msgstr ""
 msgid "Edit team"
 msgstr ""
 
-#: client/src/templates/templates.list.js:105
+#: client/src/templates/templates.list.js:82
 msgid "Edit template"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:191
-msgid "Edit the Schedule"
-msgstr ""
-
-#: client/src/job-results/job-results.partial.html:175
 #: client/src/workflow-results/workflow-results.partial.html:124
 msgid "Edit the User"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:265
-#: client/src/job-results/job-results.partial.html:280
-#: client/src/job-results/job-results.partial.html:296
-#: client/src/job-results/job-results.partial.html:311
-#: client/src/job-results/job-results.partial.html:326
-msgid "Edit the credential"
-msgstr ""
-
-#: client/src/job-results/job-results.partial.html:206
-msgid "Edit the inventory"
-msgstr ""
-
-#: client/src/job-results/job-results.partial.html:140
-msgid "Edit the job template"
-msgstr ""
-
-#: client/src/job-results/job-results.partial.html:229
-#: client/src/projects/projects.list.js:105
+#: client/src/projects/projects.list.js:88
 msgid "Edit the project"
 msgstr ""
 
@@ -1392,35 +1460,29 @@ msgstr ""
 msgid "Edit user"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:61
-msgid "Edit {{BRAND_NAME}}'s configuration."
-msgstr ""
-
-#: client/src/projects/list/projects-list.controller.js:241
+#: client/src/projects/list/projects-list.controller.js:276
 msgid "Either you do not have access or the SCM update process completed. Click the %sRefresh%s button to view the latest status."
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:520
-msgid "Elapsed"
-msgstr ""
-
 #: client/src/credentials/credentials.form.js:191
-#: client/src/users/users.form.js:51
+#: client/src/users/users.form.js:54
 msgid "Email"
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:288
-#: client/src/templates/job_templates/job-template.form.js:293
+#: client/src/templates/job_templates/job-template.form.js:298
+#: client/src/templates/job_templates/job-template.form.js:303
+#: client/src/templates/workflows.form.js:101
+#: client/src/templates/workflows.form.js:106
 msgid "Enable Concurrent Jobs"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:123
-#: client/src/templates/job_templates/job-template.form.js:264
-#: client/src/templates/job_templates/job-template.form.js:269
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:124
+#: client/src/templates/job_templates/job-template.form.js:274
+#: client/src/templates/job_templates/job-template.form.js:279
 msgid "Enable Privilege Escalation"
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:279
+#: client/src/templates/job_templates/job-template.form.js:289
 msgid "Enables creation of a provisioning callback URL. Using the URL a host can contact {{BRAND_NAME}} and request a configuration update using this job template."
 msgstr ""
 
@@ -1435,11 +1497,11 @@ msgstr ""
 #: client/src/inventories-hosts/hosts/host.form.js:73
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:72
 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:72
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:86
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:68
 msgid "Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:93
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:76
 msgid "Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax."
 msgstr ""
 
@@ -1447,7 +1509,7 @@ msgstr ""
 msgid "Enter one HipChat channel per line. The pound symbol (#) is not required."
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.form.js:362
+#: client/src/notifications/notificationTemplates.form.js:433
 msgid "Enter one IRC channel or username per line. The pound symbol (#) for channels, and the at (@) symbol for users, are not required."
 msgstr ""
 
@@ -1493,35 +1555,39 @@ msgstr ""
 msgid "Environment Variables"
 msgstr ""
 
-#: client/src/configuration/configuration.controller.js:348
-#: client/src/configuration/configuration.controller.js:449
-#: client/src/configuration/configuration.controller.js:483
-#: client/src/configuration/configuration.controller.js:530
+#: client/src/configuration/configuration.controller.js:141
+msgid "Error"
+msgstr ""
+
+#: client/lib/services/base-string.service.js:89
+#: client/src/configuration/configuration.controller.js:402
+#: client/src/configuration/configuration.controller.js:502
+#: client/src/configuration/configuration.controller.js:536
+#: client/src/configuration/configuration.controller.js:583
 #: client/src/configuration/system-form/configuration-system.controller.js:231
 #: client/src/credentials/factories/credential-form-save.factory.js:77
 #: client/src/credentials/factories/credential-form-save.factory.js:93
-#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:129
-#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:139
-#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:166
-#: client/src/job-submission/job-submission-factories/launchjob.factory.js:194
-#: client/src/job-submission/job-submission-factories/launchjob.factory.js:213
-#: client/src/management-jobs/card/card.controller.js:140
-#: client/src/management-jobs/card/card.controller.js:230
+#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:131
+#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:141
+#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:168
+#: client/src/job-submission/job-submission-factories/launchjob.factory.js:198
+#: client/src/job-submission/job-submission-factories/launchjob.factory.js:217
+#: client/src/management-jobs/card/card.controller.js:102
 #: client/src/management-jobs/card/card.controller.js:28
-#: client/src/projects/add/projects-add.controller.js:108
-#: client/src/projects/edit/projects-edit.controller.js:156
-#: client/src/projects/edit/projects-edit.controller.js:222
-#: client/src/projects/edit/projects-edit.controller.js:238
-#: client/src/projects/list/projects-list.controller.js:169
-#: client/src/projects/list/projects-list.controller.js:198
-#: client/src/projects/list/projects-list.controller.js:225
-#: client/src/projects/list/projects-list.controller.js:246
-#: client/src/projects/list/projects-list.controller.js:262
-#: client/src/projects/list/projects-list.controller.js:271
+#: client/src/projects/add/projects-add.controller.js:116
+#: client/src/projects/edit/projects-edit.controller.js:163
+#: client/src/projects/edit/projects-edit.controller.js:229
+#: client/src/projects/edit/projects-edit.controller.js:245
+#: client/src/projects/list/projects-list.controller.js:186
+#: client/src/projects/list/projects-list.controller.js:213
+#: client/src/projects/list/projects-list.controller.js:260
+#: client/src/projects/list/projects-list.controller.js:281
+#: client/src/projects/list/projects-list.controller.js:297
+#: client/src/projects/list/projects-list.controller.js:306
 #: client/src/users/add/users-add.controller.js:99
-#: client/src/users/edit/users-edit.controller.js:180
-#: client/src/users/edit/users-edit.controller.js:80
-#: client/src/users/list/users-list.controller.js:82
+#: client/src/users/edit/users-edit.controller.js:185
+#: client/src/users/edit/users-edit.controller.js:82
+#: client/src/users/list/users-list.controller.js:84
 msgid "Error!"
 msgstr ""
 
@@ -1529,30 +1595,26 @@ msgstr ""
 msgid "Event"
 msgstr ""
 
-#: client/src/job-results/parse-stdout.service.js:68
-msgid "Event ID"
-msgstr ""
-
 #: client/src/activity-stream/factories/build-description.factory.js:120
 msgid "Event summary not available"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:129
-#: client/src/projects/edit/projects-edit.controller.js:265
+#: client/src/projects/add/projects-add.controller.js:137
+#: client/src/projects/edit/projects-edit.controller.js:272
 msgid "Example URLs for GIT SCM include:"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:150
-#: client/src/projects/edit/projects-edit.controller.js:285
+#: client/src/projects/add/projects-add.controller.js:158
+#: client/src/projects/edit/projects-edit.controller.js:292
 msgid "Example URLs for Mercurial SCM include:"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:141
-#: client/src/projects/edit/projects-edit.controller.js:276
+#: client/src/projects/add/projects-add.controller.js:149
+#: client/src/projects/edit/projects-edit.controller.js:283
 msgid "Example URLs for Subversion SCM include:"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:47
 msgid "Example: ansible_facts.ansible_distribution:\"RedHat\""
 msgstr ""
 
@@ -1564,37 +1626,29 @@ msgstr ""
 msgid "Existing Host"
 msgstr ""
 
-#: client/src/job-results/job-results.controller.js:18
-#: client/src/job-results/job-results.controller.js:228
-#: client/src/standard-out/standard-out.controller.js:24
-#: client/src/standard-out/standard-out.controller.js:245
+#: client/features/output/jobs.strings.js:28
 #: client/src/workflow-results/workflow-results.controller.js:120
 #: client/src/workflow-results/workflow-results.controller.js:76
 msgid "Expand Output"
 msgstr ""
 
+#: client/src/network-ui/network-nav/network.nav.strings.js:12
+msgid "Expand Panel"
+msgstr ""
+
 #: client/src/license/license.partial.html:39
 msgid "Expires On"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:81
-msgid "Explanation"
-msgstr ""
-
-#: client/src/job-results/job-results.partial.html:275
-msgid "Extra Credentials"
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:132
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:144
-#: client/src/job-results/job-results.partial.html:409
+#: client/features/templates/templates.strings.js:53
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:133
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:145
 #: client/src/job-submission/job-submission.partial.html:165
 #: client/src/partials/logviewer.html:8
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:105
-#: client/src/templates/job_templates/job-template.form.js:342
-#: client/src/templates/job_templates/job-template.form.js:349
-#: client/src/templates/workflows.form.js:74
-#: client/src/templates/workflows.form.js:81
+#: client/src/templates/job_templates/job-template.form.js:352
+#: client/src/templates/job_templates/job-template.form.js:359
+#: client/src/templates/workflows.form.js:84
+#: client/src/templates/workflows.form.js:91
 msgid "Extra Variables"
 msgstr ""
 
@@ -1611,18 +1665,13 @@ msgstr ""
 msgid "FIELDS:"
 msgstr ""
 
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:39
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:72
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:52
-msgid "FINISHED"
-msgstr ""
-
 #: client/src/inventories-hosts/hosts/host.form.js:107
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:106
 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:107
 msgid "Facts"
 msgstr ""
 
+#: client/lib/components/components.strings.js:91
 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:80
 msgid "Failed"
 msgstr ""
@@ -1639,28 +1688,28 @@ msgstr ""
 msgid "Failed to create new Credential. POST status:"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:109
+#: client/src/projects/add/projects-add.controller.js:117
 msgid "Failed to create new project. POST returned status:"
 msgstr ""
 
-#: client/src/job-submission/job-submission-factories/launchjob.factory.js:214
+#: client/src/job-submission/job-submission-factories/launchjob.factory.js:218
 msgid "Failed to retrieve job template extra variables."
 msgstr ""
 
-#: client/src/projects/edit/projects-edit.controller.js:157
+#: client/src/projects/edit/projects-edit.controller.js:164
 msgid "Failed to retrieve project: %s. GET status:"
 msgstr ""
 
-#: client/src/users/edit/users-edit.controller.js:181
-#: client/src/users/edit/users-edit.controller.js:81
+#: client/src/users/edit/users-edit.controller.js:186
+#: client/src/users/edit/users-edit.controller.js:83
 msgid "Failed to retrieve user: %s. GET status:"
 msgstr ""
 
-#: client/src/configuration/configuration.controller.js:450
+#: client/src/configuration/configuration.controller.js:503
 msgid "Failed to save settings. Returned status:"
 msgstr ""
 
-#: client/src/configuration/configuration.controller.js:484
+#: client/src/configuration/configuration.controller.js:537
 msgid "Failed to save toggle settings. Returned status:"
 msgstr ""
 
@@ -1668,47 +1717,36 @@ msgstr ""
 msgid "Failed to update Credential. PUT status:"
 msgstr ""
 
-#: client/src/projects/edit/projects-edit.controller.js:222
+#: client/src/projects/edit/projects-edit.controller.js:229
 msgid "Failed to update project: %s. PUT status:"
 msgstr ""
 
-#: client/src/job-submission/job-submission-factories/launchjob.factory.js:195
-#: client/src/management-jobs/card/card.controller.js:141
-#: client/src/management-jobs/card/card.controller.js:231
+#: client/src/job-submission/job-submission-factories/launchjob.factory.js:199
+#: client/src/management-jobs/card/card.controller.js:103
 msgid "Failed updating job %s with variables. POST returned: %d"
 msgstr ""
 
-#: client/src/projects/factories/get-project-tool-tip.factory.js:24
-msgid "Failed. Click for details"
-msgstr ""
-
-#: client/src/notifications/notifications.list.js:48
+#: client/src/notifications/notifications.list.js:49
 msgid "Failure"
 msgstr ""
 
-#: client/src/scheduler/schedules.list.js:48
+#: client/src/scheduler/schedules.list.js:56
 msgid "Final Run"
 msgstr ""
 
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:59
-#: client/src/instance-groups/jobs/jobs.list.js:57
+#: client/features/jobs/jobs.strings.js:9
 #: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:54
-#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:58
 #: client/src/inventories-hosts/shared/factories/set-status.factory.js:44
-#: client/src/job-results/job-results.partial.html:111
-#: client/src/jobs/all-jobs.list.js:66
-#: client/src/portal-mode/portal-jobs.list.js:40
-#: client/src/templates/completed-jobs.list.js:59
 msgid "Finished"
 msgstr ""
 
 #: client/src/access/rbac-multiselect/permissionsUsers.list.js:21
-#: client/src/users/users.form.js:26
+#: client/src/users/users.form.js:29
 #: client/src/users/users.list.js:33
 msgid "First Name"
 msgstr ""
 
-#: client/src/scheduler/schedules.list.js:38
+#: client/src/scheduler/schedules.list.js:46
 msgid "First Run"
 msgstr ""
 
@@ -1734,16 +1772,10 @@ msgstr ""
 msgid "For job templates, select run to execute the playbook. Select check to only check playbook syntax, test environment setup, and report problems without executing the playbook."
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:118
-msgid "For more information and examples see %sthe Patterns topic at docs.ansible.com%s."
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:109
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:96
-#: client/src/job-results/job-results.partial.html:336
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:87
-#: client/src/templates/job_templates/job-template.form.js:144
-#: client/src/templates/job_templates/job-template.form.js:154
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:110
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:97
+#: client/src/templates/job_templates/job-template.form.js:143
+#: client/src/templates/job_templates/job-template.form.js:153
 msgid "Forks"
 msgstr ""
 
@@ -1756,24 +1788,29 @@ msgstr ""
 msgid "GROUPS"
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:107
+#: client/src/projects/edit/projects-edit.controller.js:135
+#: client/src/projects/list/projects-list.controller.js:76
+msgid "Get latest SCM revision"
+msgstr ""
+
+#: client/src/configuration/auth-form/configuration-auth.controller.js:126
 msgid "GitHub"
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:108
+#: client/src/configuration/auth-form/configuration-auth.controller.js:127
 msgid "GitHub Org"
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:109
+#: client/src/configuration/auth-form/configuration-auth.controller.js:128
 msgid "GitHub Team"
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:110
+#: client/src/configuration/auth-form/configuration-auth.controller.js:129
 msgid "Google OAuth2"
 msgstr ""
 
-#: client/src/teams/teams.form.js:155
-#: client/src/users/users.form.js:214
+#: client/src/teams/teams.form.js:158
+#: client/src/users/users.form.js:217
 msgid "Grant Permission"
 msgstr ""
 
@@ -1792,10 +1829,6 @@ msgstr ""
 msgid "Group Variables"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:5
-msgid "Group all of your content to manage permissions across departments in your company."
-msgstr ""
-
 #: client/src/inventories-hosts/hosts/host.form.js:115
 #: client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.list.js:31
 #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:89
@@ -1805,15 +1838,16 @@ msgstr ""
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:114
 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:115
 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:32
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:167
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:150
 msgid "Groups"
 msgstr ""
 
 #: client/lib/components/components.strings.js:12
+#: client/lib/services/base-string.service.js:65
 msgid "HIDE"
 msgstr ""
 
-#: client/lib/components/components.strings.js:39
+#: client/lib/components/components.strings.js:43
 msgid "HINT: Drag and drop an SSH private key file on the field below."
 msgstr ""
 
@@ -1849,8 +1883,8 @@ msgstr ""
 msgid "Host (Authentication URL)"
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:324
-#: client/src/templates/job_templates/job-template.form.js:333
+#: client/src/templates/job_templates/job-template.form.js:334
+#: client/src/templates/job_templates/job-template.form.js:343
 msgid "Host Config Key"
 msgstr ""
 
@@ -1866,6 +1900,7 @@ msgstr ""
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:56
 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:45
 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:56
+#: client/src/network-ui/network-details/details.partial.html:16
 msgid "Host Name"
 msgstr ""
 
@@ -1891,14 +1926,17 @@ msgstr ""
 msgid "Host is not available. Click to toggle."
 msgstr ""
 
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:25
+#: client/features/output/jobs.strings.js:13
+msgid "Host status information for this job is unavailable."
+msgstr ""
+
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:26
 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:39
 #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:98
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:57
 #: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:56
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:167
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:176
-#: client/src/job-results/job-results.partial.html:504
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:149
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:159
 msgid "Hosts"
 msgstr ""
 
@@ -1914,8 +1952,8 @@ msgstr ""
 msgid "Hosts Used"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:185
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:267
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:239
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:253
 msgid "Hosts are imported to"
 msgstr ""
 
@@ -1923,12 +1961,6 @@ msgstr ""
 msgid "I agree to the End User License Agreement"
 msgstr ""
 
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:27
-#: client/src/instance-groups/jobs/jobs.list.js:26
-#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:38
-msgid "ID"
-msgstr ""
-
 #: client/src/partials/job-template-details.html:2
 msgid "INFO"
 msgstr ""
@@ -1943,12 +1975,11 @@ msgstr ""
 
 #: client/src/instance-groups/instance-groups.list.js:6
 #: client/src/instance-groups/instance-groups.list.js:7
-#: client/src/instance-groups/instance-groups.route.js:10
-#: client/src/instance-groups/list/instance-groups-list.partial.html:3
+#: client/src/instance-groups/instance-groups.strings.js:13
 msgid "INSTANCE GROUPS"
 msgstr ""
 
-#: client/src/instance-groups/instance-group.partial.html:27
+#: client/src/instance-groups/instance-groups.strings.js:18
 msgid "INSTANCES"
 msgstr ""
 
@@ -1958,10 +1989,9 @@ msgstr ""
 #: client/src/inventories-hosts/inventories/inventories.route.js:8
 #: client/src/inventories-hosts/inventories/inventory.list.js:14
 #: client/src/inventories-hosts/inventories/inventory.list.js:15
-#: client/src/main-menu/main-menu.partial.html:104
-#: client/src/main-menu/main-menu.partial.html:27
-#: client/src/organizations/linkout/organizations-linkout.route.js:143
-#: client/src/organizations/list/organizations-list.controller.js:66
+#: client/src/network-ui/network-nav/network.nav.strings.js:8
+#: client/src/organizations/linkout/organizations-linkout.route.js:144
+#: client/src/organizations/list/organizations-list.controller.js:67
 msgid "INVENTORIES"
 msgstr ""
 
@@ -1976,7 +2006,7 @@ msgstr ""
 
 #: client/src/activity-stream/get-target-title.factory.js:35
 #: client/src/inventory-scripts/inventory-scripts.list.js:12
-#: client/src/inventory-scripts/main.js:66
+#: client/src/inventory-scripts/main.js:65
 msgid "INVENTORY SCRIPTS"
 msgstr ""
 
@@ -1984,19 +2014,19 @@ msgstr ""
 msgid "INVENTORY SOURCES"
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.form.js:348
+#: client/src/notifications/notificationTemplates.form.js:419
 msgid "IRC Nick"
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.form.js:337
+#: client/src/notifications/notificationTemplates.form.js:408
 msgid "IRC Server Address"
 msgstr ""
 
-#: client/src/notifications/shared/type-change.service.js:58
+#: client/src/notifications/shared/type-change.service.js:66
 msgid "IRC Server Password"
 msgstr ""
 
-#: client/src/notifications/shared/type-change.service.js:57
+#: client/src/notifications/shared/type-change.service.js:65
 msgid "IRC Server Port"
 msgstr ""
 
@@ -2008,12 +2038,17 @@ msgstr ""
 msgid "ITEMS"
 msgstr ""
 
+#: client/src/notifications/notificationTemplates.form.js:362
+#: client/src/notifications/notificationTemplates.form.js:394
+msgid "Icon URL"
+msgstr ""
+
 #: client/src/login/authenticationServices/timer.factory.js:157
 msgid "Idle Session"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:182
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:263
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:236
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:249
 msgid "If blank, all groups above are created except"
 msgstr ""
 
@@ -2025,23 +2060,27 @@ msgstr ""
 msgid "If checked, any hosts and groups that were previously present on the external source but are now removed will be removed from the Tower inventory. Hosts and groups that were not managed by the inventory source will be promoted to the next manually created group or if there is no manually created group to promote them into, they will be left in the \"all\" default group for the inventory."
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:267
+#: client/src/templates/job_templates/job-template.form.js:277
 msgid "If enabled, run this playbook as an administrator."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:120
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:121
 msgid "If enabled, show the changes made by Ansible tasks, where supported. This is equivalent to Ansible&#x2019;s --diff mode."
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:251
+#: client/src/templates/job_templates/job-template.form.js:262
 msgid "If enabled, show the changes made by Ansible tasks, where supported. This is equivalent to Ansible&#x2019s --diff mode."
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:291
+#: client/src/templates/job_templates/job-template.form.js:301
 msgid "If enabled, simultaneous runs of this job template will be allowed."
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:302
+#: client/src/templates/workflows.form.js:104
+msgid "If enabled, simultaneous runs of this workflow job template will be allowed."
+msgstr ""
+
+#: client/src/templates/job_templates/job-template.form.js:312
 msgid "If enabled, use cached facts if available and store discovered facts in the cache."
 msgstr ""
 
@@ -2053,8 +2092,8 @@ msgstr ""
 msgid "If you are ready to upgrade, please contact us by clicking the button below"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:173
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:254
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:227
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:240
 msgid "Image ID:"
 msgstr ""
 
@@ -2087,7 +2126,7 @@ msgstr ""
 msgid "Insights"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:69
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:52
 msgid "Insights Credential"
 msgstr ""
 
@@ -2096,43 +2135,47 @@ msgstr ""
 msgid "Instance Filters"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:369
-msgid "Instance Group"
+#: client/src/instance-groups/instance-groups.strings.js:47
+msgid "Instance Group parameter is missing."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:72
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:75
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:78
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:81
+#: client/lib/components/components.strings.js:75
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:54
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:57
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:61
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:64
 #: client/src/organizations/organizations.form.js:38
 #: client/src/organizations/organizations.form.js:41
-#: client/src/setup-menu/setup-menu.partial.html:54
-#: client/src/templates/job_templates/job-template.form.js:191
-#: client/src/templates/job_templates/job-template.form.js:194
+#: client/src/templates/job_templates/job-template.form.js:247
+#: client/src/templates/job_templates/job-template.form.js:250
 msgid "Instance Groups"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:182
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:263
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:236
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:249
 msgid "Instance ID"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:174
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:255
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:228
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:241
 msgid "Instance ID:"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:175
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:256
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:229
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:242
 msgid "Instance Type:"
 msgstr ""
 
+#: client/lib/components/components.strings.js:74
+msgid "Instances"
+msgstr ""
+
 #: client/src/license/license.partial.html:11
 msgid "Invalid License"
 msgstr ""
 
-#: client/src/license/license.controller.js:63
-#: client/src/license/license.controller.js:70
+#: client/src/license/license.controller.js:86
+#: client/src/license/license.controller.js:94
 msgid "Invalid file format. Please upload valid JSON."
 msgstr ""
 
@@ -2144,25 +2187,26 @@ msgstr ""
 msgid "Invalid username and/or password.  Please try again."
 msgstr ""
 
+#: client/lib/components/components.strings.js:66
+#: client/lib/models/models.strings.js:16
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:122
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:52
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:26
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:27
 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:50
-#: client/src/organizations/linkout/organizations-linkout.route.js:155
+#: client/src/organizations/linkout/organizations-linkout.route.js:156
 msgid "Inventories"
 msgstr ""
 
+#: client/features/jobs/jobs.strings.js:13
+#: client/features/templates/templates.strings.js:16
+#: client/features/templates/templates.strings.js:24
 #: client/src/inventories-hosts/hosts/host.list.js:69
 #: client/src/inventories-hosts/inventories/inventory.list.js:80
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69
-#: client/src/job-results/job-results.partial.html:201
+#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:71
 #: client/src/job-submission/job-submission.partial.html:17
 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:58
 #: client/src/templates/job_templates/job-template.form.js:66
 #: client/src/templates/job_templates/job-template.form.js:80
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:72
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:82
 msgid "Inventory"
 msgstr ""
 
@@ -2171,11 +2215,16 @@ msgstr ""
 msgid "Inventory File"
 msgstr ""
 
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:27
-#: client/src/setup-menu/setup-menu.partial.html:41
+#: client/lib/components/components.strings.js:71
+#: client/lib/models/models.strings.js:20
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:28
 msgid "Inventory Scripts"
 msgstr ""
 
+#: client/lib/models/models.strings.js:25
+msgid "Inventory Sources"
+msgstr ""
+
 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:46
 msgid "Inventory Sync"
 msgstr ""
@@ -2184,11 +2233,11 @@ msgstr ""
 msgid "Inventory Sync Failures"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:93
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:75
 msgid "Inventory Variables"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:66
+#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:68
 msgid "Inventory contains 0 hosts."
 msgstr ""
 
@@ -2200,26 +2249,28 @@ msgstr ""
 msgid "JOB TEMPLATE"
 msgstr ""
 
-#: client/src/organizations/linkout/organizations-linkout.route.js:256
-#: client/src/organizations/list/organizations-list.controller.js:78
+#: client/features/templates/routes/organizationsTemplatesList.route.js:20
+#: client/features/templates/routes/projectsTemplatesList.route.js:18
+#: client/src/organizations/list/organizations-list.controller.js:79
 #: client/src/portal-mode/portal-job-templates.list.js:13
 #: client/src/portal-mode/portal-job-templates.list.js:14
 msgid "JOB TEMPLATES"
 msgstr ""
 
+#: client/features/jobs/index.view.html:6
+#: client/features/jobs/routes/instanceGroupJobs.route.js:13
+#: client/features/jobs/routes/instanceJobs.route.js:13
+#: client/features/jobs/routes/inventoryCompletedJobs.route.js:22
+#: client/features/jobs/routes/jobs.route.js:12
 #: client/src/activity-stream/get-target-title.factory.js:32
 #: client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js:118
-#: client/src/instance-groups/instance-group.partial.html:28
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:27
-#: client/src/instance-groups/jobs/jobs-list.route.js:9
-#: client/src/jobs/jobs.route.js:15
-#: client/src/main-menu/main-menu.partial.html:122
-#: client/src/main-menu/main-menu.partial.html:43
-#: client/src/portal-mode/portal-jobs.list.js:13
-#: client/src/portal-mode/portal-jobs.list.js:17
+#: client/src/instance-groups/instance-groups.strings.js:19
+#: client/src/portal-mode/portal-mode-layout.partial.html:10
 msgid "JOBS"
 msgstr ""
 
+#: client/lib/components/code-mirror/code-mirror.strings.js:12
+#: client/lib/services/base-string.service.js:69
 #: client/src/job-submission/job-submission.partial.html:173
 msgid "JSON"
 msgstr ""
@@ -2230,58 +2281,49 @@ msgstr ""
 msgid "JSON:"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:384
+#: client/features/templates/templates.strings.js:47
 #: client/src/job-submission/job-submission.partial.html:228
-#: client/src/templates/job_templates/job-template.form.js:200
-#: client/src/templates/job_templates/job-template.form.js:207
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:127
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:135
+#: client/src/templates/job_templates/job-template.form.js:190
+#: client/src/templates/job_templates/job-template.form.js:197
 msgid "Job Tags"
 msgstr ""
 
+#: client/features/jobs/jobs.strings.js:12
+#: client/features/templates/templates.strings.js:13
 #: client/src/templates/templates.list.js:61
 msgid "Job Template"
 msgstr ""
 
+#: client/lib/models/models.strings.js:30
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:103
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:36
-#: client/src/organizations/linkout/organizations-linkout.route.js:268
+#: client/src/projects/projects.form.js:297
 msgid "Job Templates"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:49
 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:32
-#: client/src/job-results/job-results.partial.html:159
 #: client/src/job-submission/job-submission.partial.html:202
 #: client/src/templates/job_templates/job-template.form.js:47
 #: client/src/templates/job_templates/job-template.form.js:55
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:103
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:92
 msgid "Job Type"
 msgstr ""
 
-#: client/src/job-results/job-results-stdout/job-results-stdout.partial.html:46
-msgid "Job details are not available for this job.  Please download to view standard out."
-msgstr ""
-
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:28
-#: client/src/configuration/configuration.partial.html:16
-#: client/src/jobs/jobs.partial.html:7
+#: client/lib/components/components.strings.js:60
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:29
+#: client/src/configuration/configuration.partial.html:22
+#: client/src/instance-groups/instance-groups.strings.js:37
 msgid "Jobs"
 msgstr ""
 
-#: client/src/job-results/job-results.controller.js:269
-#: client/src/job-results/job-results.controller.js:366
-msgid "Jump to last line of standard out."
-msgstr ""
-
 #: client/src/access/add-rbac-resource/rbac-resource.partial.html:61
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:154
 #: client/src/shared/smart-search/smart-search.partial.html:14
 msgid "Key"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:176
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:257
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:230
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:243
 msgid "Key Name:"
 msgstr ""
 
@@ -2290,50 +2332,77 @@ msgstr ""
 msgid "Kind"
 msgstr ""
 
+#: client/features/applications/applications.strings.js:30
+msgid "LAST MODIFIED"
+msgstr ""
+
+#: client/features/users/tokens/tokens.strings.js:37
+msgid "LAST USED"
+msgstr ""
+
+#: client/features/templates/templates.strings.js:29
+msgid "LAUNCH"
+msgstr ""
+
 #: client/src/job-submission/job-submission.partial.html:6
 msgid "LAUNCH JOB"
 msgstr ""
 
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:86
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:66
-msgid "LAUNCH TYPE"
-msgstr ""
-
-#: client/src/configuration/auth-form/configuration-auth.controller.js:111
+#: client/src/configuration/auth-form/configuration-auth.controller.js:130
 msgid "LDAP"
 msgstr ""
 
-#: client/src/license/license.route.js:19
+#: client/src/configuration/auth-form/configuration-auth.controller.js:138
+msgid "LDAP 1 (Optional)"
+msgstr ""
+
+#: client/src/configuration/auth-form/configuration-auth.controller.js:139
+msgid "LDAP 2 (Optional)"
+msgstr ""
+
+#: client/src/configuration/auth-form/configuration-auth.controller.js:140
+msgid "LDAP 3 (Optional)"
+msgstr ""
+
+#: client/src/configuration/auth-form/configuration-auth.controller.js:141
+msgid "LDAP 4 (Optional)"
+msgstr ""
+
+#: client/src/configuration/auth-form/configuration-auth.controller.js:142
+msgid "LDAP 5 (Optional)"
+msgstr ""
+
+#: client/src/configuration/auth-form/configuration-auth.partial.html:17
+msgid "LDAP Server"
+msgstr ""
+
+#: client/src/configuration/license.route.js:18
+#: client/src/license/license.route.js:18
 msgid "LICENSE"
 msgstr ""
 
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:58
-msgid "LICENSE ERROR"
-msgstr ""
-
-#: client/src/main-menu/main-menu.partial.html:83
-msgid "LOG OUT"
-msgstr ""
-
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:68
-#: client/src/instance-groups/jobs/jobs.list.js:66
-#: client/src/job-results/job-results.partial.html:434
-#: client/src/job-results/job-results.partial.html:443
-#: client/src/jobs/all-jobs.list.js:74
-#: client/src/templates/job_templates/job-template.form.js:234
-#: client/src/templates/job_templates/job-template.form.js:238
+#: client/src/templates/job_templates/job-template.form.js:224
+#: client/src/templates/job_templates/job-template.form.js:228
 #: client/src/templates/templates.list.js:43
-#: client/src/templates/workflows.form.js:62
-#: client/src/templates/workflows.form.js:67
+#: client/src/templates/workflows.form.js:72
+#: client/src/templates/workflows.form.js:77
 msgid "Labels"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:19
+msgid "Last Modified"
+msgstr ""
+
 #: client/src/access/rbac-multiselect/permissionsUsers.list.js:25
-#: client/src/users/users.form.js:33
+#: client/src/users/users.form.js:36
 #: client/src/users/users.list.js:37
 msgid "Last Name"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:20
+msgid "Last Ran"
+msgstr ""
+
 #: client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js:56
 msgid "Last Sync"
 msgstr ""
@@ -2342,9 +2411,7 @@ msgstr ""
 msgid "Last Updated"
 msgstr ""
 
-#: client/src/portal-mode/portal-job-templates.list.js:36
-#: client/src/shared/form-generator.js:1707
-#: client/src/templates/templates.list.js:80
+#: client/src/shared/form-generator.js:1716
 msgid "Launch"
 msgstr ""
 
@@ -2352,21 +2419,21 @@ msgstr ""
 msgid "Launch Management Job"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:170
-#: client/src/job-results/job-results.partial.html:185
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:76
+#: client/features/jobs/jobs.strings.js:11
 msgid "Launched By"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:37
 #: client/src/job-submission/job-submission.partial.html:99
 msgid "Launching this job requires the passwords listed below. Enter and confirm each password before continuing."
 msgstr ""
 
-#: client/features/credentials/legacy.credentials.js:357
+#: client/features/credentials/legacy.credentials.js:350
 msgid "Legacy state configuration for  does not exist"
 msgstr ""
 
-#: client/src/license/license.controller.js:40
+#: client/src/configuration/configuration.partial.html:43
+#: client/src/license/license.controller.js:44
 #: client/src/license/license.partial.html:8
 msgid "License"
 msgstr ""
@@ -2379,7 +2446,7 @@ msgstr ""
 msgid "License Key"
 msgstr ""
 
-#: client/src/license/license.controller.js:40
+#: client/src/license/license.controller.js:46
 msgid "License Management"
 msgstr ""
 
@@ -2387,46 +2454,43 @@ msgstr ""
 msgid "License Type"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:48
 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:45
 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:55
-#: client/src/job-results/job-results.partial.html:347
 #: client/src/job-submission/job-submission.partial.html:220
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:92
-#: client/src/templates/job_templates/job-template.form.js:160
-#: client/src/templates/job_templates/job-template.form.js:164
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:113
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:120
+#: client/src/templates/job_templates/job-template.form.js:159
+#: client/src/templates/job_templates/job-template.form.js:163
 msgid "Limit"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:186
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:268
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:240
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:254
 msgid "Limit to hosts having a tag:"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:188
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:270
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:242
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:256
 msgid "Limit to hosts using either key pair:"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:190
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:272
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:244
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:258
 msgid "Limit to hosts where the Name tag begins with"
 msgstr ""
 
-#: client/src/shared/socket/socket.service.js:168
+#: client/src/shared/socket/socket.service.js:203
 msgid "Live events: attempting to connect to the  server."
 msgstr ""
 
-#: client/src/shared/socket/socket.service.js:172
+#: client/src/shared/socket/socket.service.js:207
 msgid "Live events: connected. Pages containing job status information will automatically update in real-time."
 msgstr ""
 
-#: client/src/shared/socket/socket.service.js:176
+#: client/src/shared/socket/socket.service.js:211
 msgid "Live events: error connecting to the  server."
 msgstr ""
 
-#: client/src/shared/form-generator.js:1983
+#: client/src/shared/form-generator.js:1994
 msgid "Loading..."
 msgstr ""
 
@@ -2434,10 +2498,6 @@ msgstr ""
 msgid "Local Time Zone"
 msgstr ""
 
-#: client/src/main-menu/main-menu.partial.html:188
-msgid "Log Out"
-msgstr ""
-
 #: client/src/configuration/system-form/configuration-system.controller.js:225
 msgid "Log aggregator test failed. <br> Detail:"
 msgstr ""
@@ -2446,16 +2506,24 @@ msgstr ""
 msgid "Log aggregator test successful."
 msgstr ""
 
+#: client/lib/components/components.strings.js:56
+msgid "Logged in as"
+msgstr ""
+
 #: client/src/configuration/system-form/configuration-system.controller.js:89
 msgid "Logging"
 msgstr ""
 
+#: client/lib/components/components.strings.js:58
+msgid "Logout"
+msgstr ""
+
 #: client/src/inventories-hosts/inventories/insights/insights.partial.html:35
 msgid "Low"
 msgstr ""
 
 #: client/src/management-jobs/card/card.partial.html:6
-#: client/src/management-jobs/card/card.route.js:21
+#: client/src/management-jobs/card/card.route.js:20
 msgid "MANAGEMENT JOBS"
 msgstr ""
 
@@ -2469,24 +2537,19 @@ msgid "Machine"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:60
-#: client/src/job-results/job-results.partial.html:260
 msgid "Machine Credential"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:36
-msgid "Manage the cleanup of old job history, activity streams, data marked for deletion, and system tracking info."
-msgstr ""
-
-#: client/src/setup-menu/setup-menu.partial.html:35
+#: client/lib/components/components.strings.js:73
 msgid "Management Jobs"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:89
+#: client/src/projects/list/projects-list.controller.js:91
 msgid "Manual projects do not require a schedule"
 msgstr ""
 
-#: client/src/projects/edit/projects-edit.controller.js:141
-#: client/src/projects/list/projects-list.controller.js:88
+#: client/src/projects/edit/projects-edit.controller.js:142
+#: client/src/projects/list/projects-list.controller.js:90
 msgid "Manual projects do not require an SCM update"
 msgstr ""
 
@@ -2502,8 +2565,8 @@ msgstr ""
 msgid "Misc. System"
 msgstr ""
 
-#: client/src/projects/factories/get-project-tool-tip.factory.js:27
-msgid "Missing. Click for details"
+#: client/src/templates/workflows.form.js:35
+msgid "Missing Job Templates found in the <span class='Workflow-warningLink' ng-click='openWorkflowMaker()'>Workflow Editor</span>"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:22
@@ -2511,10 +2574,6 @@ msgstr ""
 msgid "Module"
 msgstr ""
 
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:53
-msgid "Module Args"
-msgstr ""
-
 #: client/src/inventories-hosts/shared/factories/set-status.factory.js:25
 msgid "Most recent job failed. Click to view jobs."
 msgstr ""
@@ -2527,21 +2586,15 @@ msgstr ""
 msgid "Multiple Choice Options"
 msgstr ""
 
-#: client/src/portal-mode/portal-mode-jobs.partial.html:4
-#: client/src/portal-mode/portal-mode-layout.partial.html:11
+#: client/src/portal-mode/portal-mode-layout.partial.html:16
 msgid "My Jobs"
 msgstr ""
 
-#: client/src/main-menu/main-menu.partial.html:160
-msgid "My View"
+#: client/features/applications/applications.strings.js:24
+msgid "NEW APPLICATION"
 msgstr ""
 
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:19
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:19
-msgid "NAME"
-msgstr ""
-
-#: client/features/credentials/credentials.strings.js:24
+#: client/features/credentials/credentials.strings.js:26
 msgid "NEW CREDENTIAL"
 msgstr ""
 
@@ -2553,7 +2606,7 @@ msgstr ""
 msgid "NEW CUSTOM INVENTORY"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:34
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:17
 msgid "NEW INVENTORY"
 msgstr ""
 
@@ -2569,11 +2622,11 @@ msgstr ""
 msgid "NEW ORGANIZATION"
 msgstr ""
 
-#: client/src/projects/projects.form.js:16
+#: client/src/projects/projects.form.js:17
 msgid "NEW PROJECT"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:28
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:10
 msgid "NEW SMART INVENTORY"
 msgstr ""
 
@@ -2589,11 +2642,15 @@ msgstr ""
 msgid "NEW WORKFLOW JOB TEMPLATE"
 msgstr ""
 
+#: client/lib/services/base-string.service.js:63
+msgid "NEXT"
+msgstr ""
+
 #: client/src/inventories-hosts/hosts/hosts.partial.html:38
 msgid "NO HOSTS HAVE BEEN CREATED"
 msgstr ""
 
-#: client/lib/components/components.strings.js:35
+#: client/lib/components/components.strings.js:39
 msgid "NO OPTIONS AVAILABLE"
 msgstr ""
 
@@ -2612,8 +2669,8 @@ msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/sources/edit/sources-notifications.route.js:9
 #: client/src/management-jobs/notifications/notification.route.js:46
-#: client/src/notifications/main.js:43
-#: client/src/notifications/main.js:91
+#: client/src/notifications/main.js:42
+#: client/src/notifications/main.js:89
 msgid "NOTIFICATIONS"
 msgstr ""
 
@@ -2624,46 +2681,36 @@ msgstr ""
 #: client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html:14
 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:13
 #: client/src/instance-groups/instance-groups.list.js:15
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:35
-#: client/src/instance-groups/instances/instances-list.partial.html:15
-#: client/src/instance-groups/instances/instances.list.js:14
-#: client/src/instance-groups/jobs/jobs.list.js:34
-#: client/src/instance-groups/list/instance-groups-list.partial.html:26
 #: client/src/inventories-hosts/hosts/host.list.js:61
 #: client/src/inventories-hosts/inventories/inventory.list.js:47
 #: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:55
-#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:45
 #: client/src/inventories-hosts/inventories/related/groups/groups.form.js:32
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:33
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:51
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:39
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:45
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:21
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:28
 #: client/src/inventories-hosts/shared/factories/set-status.factory.js:45
 #: client/src/inventory-scripts/inventory-scripts.form.js:28
 #: client/src/inventory-scripts/inventory-scripts.list.js:20
-#: client/src/jobs/all-jobs.list.js:43
 #: client/src/management-jobs/scheduler/schedulerForm.partial.html:21
 #: client/src/notifications/notificationTemplates.form.js:32
 #: client/src/notifications/notificationTemplates.list.js:32
-#: client/src/notifications/notifications.list.js:26
+#: client/src/notifications/notifications.list.js:27
 #: client/src/organizations/organizations.form.js:26
 #: client/src/portal-mode/portal-job-templates.list.js:23
-#: client/src/portal-mode/portal-jobs.list.js:35
-#: client/src/projects/projects.form.js:29
+#: client/src/projects/projects.form.js:30
 #: client/src/projects/projects.list.js:37
 #: client/src/scheduler/scheduled-jobs.list.js:31
-#: client/src/scheduler/schedules.list.js:33
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:19
-#: client/src/teams/teams.form.js:124
-#: client/src/teams/teams.form.js:25
+#: client/src/scheduler/schedules.list.js:41
+#: client/src/teams/teams.form.js:127
+#: client/src/teams/teams.form.js:28
 #: client/src/teams/teams.list.js:23
-#: client/src/templates/completed-jobs.list.js:46
 #: client/src/templates/job_templates/job-template.form.js:34
 #: client/src/templates/templates.list.js:24
-#: client/src/templates/workflows.form.js:32
-#: client/src/users/users.form.js:142
-#: client/src/users/users.form.js:168
-#: client/src/users/users.form.js:194
+#: client/src/templates/workflows.form.js:42
+#: client/src/users/users.form.js:145
+#: client/src/users/users.form.js:171
+#: client/src/users/users.form.js:197
 msgid "Name"
 msgstr ""
 
@@ -2671,8 +2718,9 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:306
-msgid "Network Credential"
+#: client/src/inventories-hosts/inventories/inventory.list.js:104
+#: client/src/inventories-hosts/inventories/inventory.list.js:106
+msgid "Network Visualization"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.list.js:81
@@ -2688,7 +2736,7 @@ msgid "New user successfully created!"
 msgstr ""
 
 #: client/src/scheduler/scheduled-jobs.list.js:51
-#: client/src/scheduler/schedules.list.js:43
+#: client/src/scheduler/schedules.list.js:51
 msgid "Next Run"
 msgstr ""
 
@@ -2696,12 +2744,13 @@ msgstr ""
 msgid "No Credentials Have Been Created"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:61
 #: client/src/job-submission/lists/credential/job-sub-cred-list.controller.js:44
-#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:140
+#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:15
 msgid "No Credentials Matching This Type Have Been Created"
 msgstr ""
 
-#: client/src/job-results/host-event/host-event-codemirror.partial.html:3
+#: client/features/output/host-event/host-event-codemirror.partial.html:3
 msgid "No JSON data returned by the module"
 msgstr ""
 
@@ -2713,7 +2762,7 @@ msgstr ""
 msgid "No Remediation Playbook Available"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:159
+#: client/src/projects/list/projects-list.controller.js:176
 msgid "No SCM Configuration"
 msgstr ""
 
@@ -2725,7 +2774,7 @@ msgstr ""
 msgid "No Teams exist"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:150
+#: client/src/projects/list/projects-list.controller.js:152
 msgid "No Updates Available"
 msgstr ""
 
@@ -2733,24 +2782,27 @@ msgstr ""
 msgid "No Users exist"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:23
-#: client/src/templates/completed-jobs.list.js:24
-msgid "No completed jobs"
+#: client/features/templates/templates.strings.js:32
+msgid "No credentials selected"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/insights/insights.partial.html:63
 msgid "No data is available. There are no issues to report."
 msgstr ""
 
-#: client/src/license/license.controller.js:39
+#: client/src/license/license.controller.js:41
 msgid "No file selected."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:62
+#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:64
 msgid "No hosts with failures. Click for details."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:47
+#: client/features/templates/templates.strings.js:33
+msgid "No inventory selected"
+msgstr ""
+
+#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:49
 msgid "No inventory sync failures. Click for details."
 msgstr ""
 
@@ -2770,18 +2822,12 @@ msgstr ""
 msgid "No job templates were recently used."
 msgstr ""
 
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:9
-#: client/src/instance-groups/jobs/jobs.list.js:9
-#: client/src/jobs/all-jobs.list.js:18
-msgid "No jobs have yet run."
-msgstr ""
-
 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:44
 msgid "No jobs were recently run."
 msgstr ""
 
-#: client/src/teams/teams.form.js:121
-#: client/src/users/users.form.js:191
+#: client/src/teams/teams.form.js:124
+#: client/src/users/users.form.js:194
 msgid "No permissions have been granted"
 msgstr ""
 
@@ -2798,7 +2844,7 @@ msgid "No recent notifications."
 msgstr ""
 
 #: client/src/inventories-hosts/hosts/hosts.partial.html:36
-#: client/src/shared/form-generator.js:1879
+#: client/src/shared/form-generator.js:1888
 #: client/src/shared/list-generator/list-generator.factory.js:240
 msgid "No records matched your search."
 msgstr ""
@@ -2818,11 +2864,11 @@ msgstr ""
 msgid "Normal User"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:91
+#: client/src/projects/list/projects-list.controller.js:93
 msgid "Not configured for SCM"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:52
+#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:54
 msgid "Not configured for inventory sync."
 msgstr ""
 
@@ -2832,12 +2878,12 @@ msgstr ""
 
 #: client/src/notifications/notificationTemplates.form.js:288
 #: client/src/notifications/notificationTemplates.form.js:289
-#: client/src/notifications/notificationTemplates.form.js:440
-#: client/src/notifications/notificationTemplates.form.js:441
+#: client/src/notifications/notificationTemplates.form.js:472
+#: client/src/notifications/notificationTemplates.form.js:473
 msgid "Notification Color"
 msgstr ""
 
-#: client/src/notifications/notification-templates-list/list.controller.js:113
+#: client/src/notifications/notification-templates-list/list.controller.js:131
 msgid "Notification Failed."
 msgstr ""
 
@@ -2845,14 +2891,14 @@ msgstr ""
 msgid "Notification Label"
 msgstr ""
 
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:29
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:30
 msgid "Notification Templates"
 msgstr ""
 
+#: client/lib/components/components.strings.js:72
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:20
 #: client/src/management-jobs/notifications/notification.route.js:21
 #: client/src/notifications/notifications.list.js:17
-#: client/src/setup-menu/setup-menu.partial.html:48
 msgid "Notifications"
 msgstr ""
 
@@ -2860,26 +2906,28 @@ msgstr ""
 msgid "Notify Channel"
 msgstr ""
 
+#: client/lib/services/base-string.service.js:67
 #: client/src/inventories-hosts/hosts/hosts.partial.html:55
 #: client/src/job-submission/job-submission.partial.html:269
 #: client/src/partials/survey-maker-modal.html:27
-#: client/src/shared/form-generator.js:542
-#: client/src/shared/form-generator.js:773
-#: client/src/shared/generator-helpers.js:551
+#: client/src/shared/form-generator.js:547
+#: client/src/shared/form-generator.js:782
+#: client/src/shared/generator-helpers.js:554
 msgid "OFF"
 msgstr ""
 
-#: client/lib/services/base-string.service.js:63
-#: client/src/jobs/factories/delete-job.factory.js:115
+#: client/lib/services/base-string.service.js:62
+#: client/src/network-ui/network-nav/network.nav.view.html:93
 msgid "OK"
 msgstr ""
 
+#: client/lib/services/base-string.service.js:66
 #: client/src/inventories-hosts/hosts/hosts.partial.html:54
 #: client/src/job-submission/job-submission.partial.html:267
 #: client/src/partials/survey-maker-modal.html:26
-#: client/src/shared/form-generator.js:538
-#: client/src/shared/form-generator.js:771
-#: client/src/shared/generator-helpers.js:547
+#: client/src/shared/form-generator.js:543
+#: client/src/shared/form-generator.js:780
+#: client/src/shared/generator-helpers.js:550
 msgid "ON"
 msgstr ""
 
@@ -2887,28 +2935,16 @@ msgstr ""
 msgid "OPTIONS"
 msgstr ""
 
+#: client/features/applications/applications.strings.js:29
+msgid "ORG"
+msgstr ""
+
 #: client/src/activity-stream/get-target-title.factory.js:29
 #: client/src/organizations/list/organizations-list.partial.html:6
-#: client/src/organizations/main.js:52
+#: client/src/organizations/main.js:51
 msgid "ORGANIZATIONS"
 msgstr ""
 
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:116
-msgid "OVERWRITE"
-msgstr ""
-
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:123
-msgid "OVERWRITE VARS"
-msgstr ""
-
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:38
-msgid "On&nbsp;Failure"
-msgstr ""
-
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:33
-msgid "On&nbsp;Success"
-msgstr ""
-
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:157
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:162
 msgid "Only Group By"
@@ -2918,43 +2954,46 @@ msgstr ""
 msgid "OpenStack domains define administrative boundaries. It is only needed for Keystone v3 authentication URLs. Common scenarios include:"
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:240
-#: client/src/templates/workflows.form.js:69
+#: client/src/templates/job_templates/job-template.form.js:230
+#: client/src/templates/workflows.form.js:79
 msgid "Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs."
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.form.js:382
+#: client/src/notifications/notificationTemplates.form.js:453
 #: client/src/partials/logviewer.html:7
-#: client/src/templates/job_templates/job-template.form.js:259
+#: client/src/templates/job_templates/job-template.form.js:270
+#: client/src/templates/workflows.form.js:97
 msgid "Options"
 msgstr ""
 
 #: client/src/credentials/credentials.form.js:46
 #: client/src/credentials/credentials.form.js:53
 #: client/src/inventories-hosts/inventories/inventory.list.js:60
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:51
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:58
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:33
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:41
 #: client/src/inventory-scripts/inventory-scripts.form.js:40
 #: client/src/inventory-scripts/inventory-scripts.list.js:27
 #: client/src/notifications/notificationTemplates.form.js:44
-#: client/src/projects/projects.form.js:41
-#: client/src/projects/projects.form.js:47
-#: client/src/teams/teams.form.js:37
+#: client/src/projects/projects.form.js:42
+#: client/src/projects/projects.form.js:48
+#: client/src/teams/teams.form.js:40
 #: client/src/teams/teams.list.js:30
-#: client/src/templates/workflows.form.js:45
-#: client/src/templates/workflows.form.js:51
-#: client/src/users/users.form.js:40
+#: client/src/templates/workflows.form.js:55
+#: client/src/templates/workflows.form.js:61
+#: client/src/users/users.form.js:43
 msgid "Organization"
 msgstr ""
 
+#: client/lib/components/components.strings.js:68
+#: client/lib/models/models.strings.js:35
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:136
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:64
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:30
-#: client/src/setup-menu/setup-menu.partial.html:4
-#: client/src/users/users.form.js:132
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:31
+#: client/src/users/users.form.js:135
 msgid "Organizations"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:26
 #: client/src/job-submission/job-submission.partial.html:19
 msgid "Other Prompts"
 msgstr ""
@@ -3010,7 +3049,7 @@ msgstr ""
 msgid "PASSWORD"
 msgstr ""
 
-#: client/features/credentials/legacy.credentials.js:122
+#: client/features/credentials/legacy.credentials.js:117
 msgid "PERMISSIONS"
 msgstr ""
 
@@ -3022,37 +3061,24 @@ msgstr ""
 msgid "PLEASE ADD A SURVEY PROMPT."
 msgstr ""
 
-#: client/src/instance-groups/instances/instances-list.partial.html:6
-#: client/src/instance-groups/list/instance-groups-list.partial.html:16
-#: client/src/organizations/list/organizations-list.partial.html:47
-#: client/src/shared/form-generator.js:1885
+#: client/src/organizations/list/organizations-list.partial.html:46
+#: client/src/shared/form-generator.js:1894
 #: client/src/shared/list-generator/list-generator.factory.js:248
 msgid "PLEASE ADD ITEMS TO THIS LIST"
 msgstr ""
 
-#: client/src/main-menu/main-menu.partial.html:67
-msgid "PORTAL MODE"
-msgstr ""
-
 #: client/src/partials/survey-maker-modal.html:43
 msgid "PREVIEW"
 msgstr ""
 
-#: client/src/job-results/job-results.service.js:166
-msgid "PROCEED"
-msgstr ""
-
 #: client/src/partials/job-template-details.html:2
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:73
 msgid "PROJECT"
 msgstr ""
 
 #: client/src/activity-stream/get-target-title.factory.js:8
-#: client/src/main-menu/main-menu.partial.html:19
-#: client/src/main-menu/main-menu.partial.html:95
-#: client/src/organizations/linkout/organizations-linkout.route.js:195
-#: client/src/organizations/list/organizations-list.controller.js:72
-#: client/src/projects/main.js:73
+#: client/src/organizations/linkout/organizations-linkout.route.js:196
+#: client/src/organizations/list/organizations-list.controller.js:73
+#: client/src/projects/main.js:86
 #: client/src/projects/projects.list.js:14
 #: client/src/projects/projects.list.js:15
 msgid "PROJECTS"
@@ -3066,15 +3092,15 @@ msgstr ""
 msgid "Pagerduty subdomain"
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:348
+#: client/src/templates/job_templates/job-template.form.js:358
 msgid "Pass extra command line variables to the playbook. Provide key/value pairs using either YAML or JSON. Refer to the Ansible Tower documentation for example syntax."
 msgstr ""
 
-#: client/src/templates/workflows.form.js:80
+#: client/src/templates/workflows.form.js:90
 msgid "Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON. Refer to the Ansible Tower documentaton for example syntax."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:138
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:139
 msgid "Pass extra command line variables. This is the %s or %s command line parameter for %s. Provide key/value pairs using either YAML or JSON."
 msgstr ""
 
@@ -3093,8 +3119,8 @@ msgstr ""
 #: client/src/credentials/factories/kind-change.factory.js:78
 #: client/src/credentials/factories/kind-change.factory.js:97
 #: client/src/job-submission/job-submission.partial.html:104
-#: client/src/notifications/shared/type-change.service.js:28
-#: client/src/users/users.form.js:68
+#: client/src/notifications/shared/type-change.service.js:30
+#: client/src/users/users.form.js:71
 msgid "Password"
 msgstr ""
 
@@ -3128,7 +3154,7 @@ msgstr ""
 msgid "Paste the contents of the SSH private key file.%s or click to close%s"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/inventory.list.js:119
+#: client/src/inventories-hosts/inventories/inventory.list.js:134
 msgid "Pending Delete"
 msgstr ""
 
@@ -3136,44 +3162,44 @@ msgstr ""
 msgid "Period"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:29
+#: client/src/projects/add/projects-add.controller.js:31
 #: client/src/users/add/users-add.controller.js:43
 msgid "Permission Error"
 msgstr ""
 
 #: client/features/credentials/credentials.strings.js:14
-#: client/features/credentials/legacy.credentials.js:66
+#: client/features/credentials/legacy.credentials.js:63
 #: client/src/credentials/credentials.form.js:439
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:122
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:123
-#: client/src/projects/projects.form.js:233
-#: client/src/teams/teams.form.js:117
-#: client/src/templates/job_templates/job-template.form.js:386
-#: client/src/templates/workflows.form.js:114
-#: client/src/users/users.form.js:187
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:104
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:106
+#: client/src/projects/projects.form.js:247
+#: client/src/teams/teams.form.js:120
+#: client/src/templates/job_templates/job-template.form.js:397
+#: client/src/templates/workflows.form.js:140
+#: client/src/users/users.form.js:190
 msgid "Permissions"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:249
-#: client/src/shared/form-generator.js:1069
+#: client/src/shared/form-generator.js:1078
 #: client/src/templates/job_templates/job-template.form.js:107
 #: client/src/templates/job_templates/job-template.form.js:115
 msgid "Playbook"
 msgstr ""
 
-#: client/src/projects/projects.form.js:89
+#: client/src/projects/projects.form.js:90
 msgid "Playbook Directory"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:59
 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:52
 msgid "Playbook Run"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:488
-msgid "Plays"
+#: client/lib/components/components.strings.js:99
+msgid "Please add items to this list."
 msgstr ""
 
-#: client/src/users/users.form.js:126
+#: client/src/users/users.form.js:129
 msgid "Please add user to an Organization."
 msgstr ""
 
@@ -3193,23 +3219,24 @@ msgstr ""
 msgid "Please click the icon to edit the host filter."
 msgstr ""
 
-#: client/src/shared/form-generator.js:861
-#: client/src/shared/form-generator.js:956
+#: client/src/shared/form-generator.js:870
+#: client/src/shared/form-generator.js:965
 msgid "Please enter a URL that begins with ssh, http or https.  The URL may not contain the '@' character."
 msgstr ""
 
-#: client/src/shared/form-generator.js:1158
+#: client/src/shared/form-generator.js:1167
 msgid "Please enter a number greater than %d and less than %d."
 msgstr ""
 
-#: client/src/shared/form-generator.js:1160
+#: client/src/shared/form-generator.js:1169
 msgid "Please enter a number greater than %d."
 msgstr ""
 
-#: client/src/shared/form-generator.js:1152
+#: client/src/shared/form-generator.js:1161
 msgid "Please enter a number."
 msgstr ""
 
+#: client/features/templates/templates.strings.js:38
 #: client/src/job-submission/job-submission.partial.html:112
 #: client/src/job-submission/job-submission.partial.html:126
 #: client/src/job-submission/job-submission.partial.html:140
@@ -3222,15 +3249,15 @@ msgstr ""
 msgid "Please enter a username."
 msgstr ""
 
-#: client/src/shared/form-generator.js:851
-#: client/src/shared/form-generator.js:946
+#: client/src/shared/form-generator.js:860
+#: client/src/shared/form-generator.js:955
 msgid "Please enter a valid email address."
 msgstr ""
 
 #: client/lib/components/components.strings.js:15
-#: client/src/shared/form-generator.js:1016
-#: client/src/shared/form-generator.js:846
-#: client/src/shared/form-generator.js:941
+#: client/src/shared/form-generator.js:1025
+#: client/src/shared/form-generator.js:855
+#: client/src/shared/form-generator.js:950
 msgid "Please enter a value."
 msgstr ""
 
@@ -3239,17 +3266,25 @@ msgstr ""
 #: client/src/job-submission/job-submission.partial.html:305
 #: client/src/job-submission/job-submission.partial.html:311
 #: client/src/job-submission/job-submission.partial.html:317
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:14
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:19
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:30
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:36
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:42
 msgid "Please enter an answer between"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:58
 #: client/src/job-submission/job-submission.partial.html:316
 msgid "Please enter an answer that is a decimal number."
 msgstr ""
 
+#: client/features/templates/templates.strings.js:57
 #: client/src/job-submission/job-submission.partial.html:310
 msgid "Please enter an answer that is a valid integer."
 msgstr ""
 
+#: client/features/templates/templates.strings.js:55
 #: client/src/job-submission/job-submission.partial.html:288
 #: client/src/job-submission/job-submission.partial.html:293
 #: client/src/job-submission/job-submission.partial.html:304
@@ -3258,16 +3293,11 @@ msgstr ""
 msgid "Please enter an answer."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:11
-#: client/src/templates/completed-jobs.list.js:11
-msgid "Please save and run a job to view."
-msgstr ""
-
-#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:50
+#: client/src/templates/job_templates/add-job-template/job-template-add.controller.js:54
 msgid "Please save before adding a survey to this job template."
 msgstr ""
 
-#: client/src/templates/workflows/add-workflow/workflow-add.controller.js:46
+#: client/src/templates/workflows/add-workflow/workflow-add.controller.js:51
 msgid "Please save before adding a survey to this workflow."
 msgstr ""
 
@@ -3275,34 +3305,34 @@ msgstr ""
 msgid "Please save before adding notifications."
 msgstr ""
 
-#: client/src/organizations/organizations.form.js:68
-#: client/src/teams/teams.form.js:69
+#: client/src/organizations/organizations.form.js:80
+#: client/src/teams/teams.form.js:72
 msgid "Please save before adding users."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:118
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:119
-#: client/src/projects/projects.form.js:225
-#: client/src/teams/teams.form.js:113
-#: client/src/templates/job_templates/job-template.form.js:379
-#: client/src/templates/workflows.form.js:107
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:100
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:102
+#: client/src/projects/projects.form.js:239
+#: client/src/teams/teams.form.js:116
+#: client/src/templates/job_templates/job-template.form.js:390
+#: client/src/templates/workflows.form.js:133
 msgid "Please save before assigning permissions."
 msgstr ""
 
-#: client/src/users/users.form.js:124
-#: client/src/users/users.form.js:183
+#: client/src/users/users.form.js:127
+#: client/src/users/users.form.js:186
 msgid "Please save before assigning to organizations."
 msgstr ""
 
-#: client/src/users/users.form.js:152
+#: client/src/users/users.form.js:155
 msgid "Please save before assigning to teams."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:164
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:147
 msgid "Please save before creating groups."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:173
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:156
 msgid "Please save before creating hosts."
 msgstr ""
 
@@ -3317,11 +3347,11 @@ msgstr ""
 msgid "Please save before defining hosts."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:182
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:165
 msgid "Please save before defining inventory sources."
 msgstr ""
 
-#: client/src/templates/workflows/add-workflow/workflow-add.controller.js:45
+#: client/src/templates/workflows/add-workflow/workflow-add.controller.js:50
 msgid "Please save before defining the workflow graph."
 msgstr ""
 
@@ -3336,7 +3366,7 @@ msgstr ""
 msgid "Please save before viewing facts."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:164
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:146
 msgid "Please save before viewing hosts."
 msgstr ""
 
@@ -3348,26 +3378,22 @@ msgstr ""
 msgid "Please select Users from the list below."
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:58
-msgid "Please select a Credential."
-msgstr ""
-
-#: client/src/templates/job_templates/multi-credential/multi-credential.partial.html:46
-msgid "Please select a machine (SSH) credential or check the \"Prompt on launch\" option."
-msgstr ""
-
-#: client/src/shared/form-generator.js:1193
+#: client/src/shared/form-generator.js:1202
 msgid "Please select a number between"
 msgstr ""
 
-#: client/src/shared/form-generator.js:1189
+#: client/src/shared/form-generator.js:1198
 msgid "Please select a number."
 msgstr ""
 
-#: client/src/shared/form-generator.js:1081
-#: client/src/shared/form-generator.js:1149
-#: client/src/shared/form-generator.js:1270
-#: client/src/shared/form-generator.js:1378
+#: client/features/templates/templates.strings.js:56
+msgid "Please select a value"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1090
+#: client/src/shared/form-generator.js:1158
+#: client/src/shared/form-generator.js:1279
+#: client/src/shared/form-generator.js:1387
 msgid "Please select a value."
 msgstr ""
 
@@ -3375,15 +3401,11 @@ msgstr ""
 msgid "Please select an Inventory or check the Prompt on launch option."
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:79
-msgid "Please select an Inventory."
-msgstr ""
-
 #: client/src/inventories-hosts/inventory-hosts.strings.js:26
 msgid "Please select an organization before editing the host filter."
 msgstr ""
 
-#: client/src/shared/form-generator.js:1186
+#: client/src/shared/form-generator.js:1195
 msgid "Please select at least one value."
 msgstr ""
 
@@ -3391,20 +3413,29 @@ msgstr ""
 msgid "Please select resources from the lists below."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:47
 msgid "Populate the hosts for this inventory by using a search filter."
 msgstr ""
 
-#: client/src/notifications/shared/type-change.service.js:27
+#: client/src/notifications/shared/type-change.service.js:29
 msgid "Port"
 msgstr ""
 
+#: client/lib/components/components.strings.js:62
+msgid "Portal Mode"
+msgstr ""
+
+#: client/features/templates/templates.strings.js:28
+msgid "Preview"
+msgstr ""
+
 #: client/src/credentials/credentials.form.js:257
 #: client/src/credentials/factories/kind-change.factory.js:21
 #: client/src/credentials/factories/kind-change.factory.js:45
 msgid "Private Key"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:41
 #: client/src/credentials/credentials.form.js:264
 #: client/src/job-submission/job-submission.partial.html:118
 msgid "Private Key Passphrase"
@@ -3415,6 +3446,7 @@ msgstr ""
 msgid "Privilege Escalation"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:42
 #: client/src/credentials/credentials.form.js:305
 #: client/src/job-submission/job-submission.partial.html:132
 msgid "Privilege Escalation Password"
@@ -3424,10 +3456,11 @@ msgstr ""
 msgid "Privilege Escalation Username"
 msgstr ""
 
+#: client/features/jobs/jobs.strings.js:14
+#: client/features/templates/templates.strings.js:17
 #: client/src/credentials/factories/become-method-change.factory.js:30
 #: client/src/credentials/factories/kind-change.factory.js:87
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:93
-#: client/src/job-results/job-results.partial.html:216
 #: client/src/templates/job_templates/job-template.form.js:100
 #: client/src/templates/job_templates/job-template.form.js:91
 msgid "Project"
@@ -3438,8 +3471,8 @@ msgstr ""
 msgid "Project (Tenant Name)"
 msgstr ""
 
-#: client/src/projects/projects.form.js:75
-#: client/src/projects/projects.form.js:83
+#: client/src/projects/projects.form.js:76
+#: client/src/projects/projects.form.js:84
 msgid "Project Base Path"
 msgstr ""
 
@@ -3447,7 +3480,7 @@ msgstr ""
 msgid "Project Name"
 msgstr ""
 
-#: client/src/projects/projects.form.js:100
+#: client/src/projects/projects.form.js:101
 msgid "Project Path"
 msgstr ""
 
@@ -3455,15 +3488,17 @@ msgstr ""
 msgid "Project Sync Failures"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:170
+#: client/src/projects/list/projects-list.controller.js:187
 msgid "Project lookup failed. GET returned:"
 msgstr ""
 
+#: client/lib/components/components.strings.js:63
+#: client/lib/models/models.strings.js:40
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:115
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:47
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:31
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:32
 #: client/src/home/dashboard/counts/dashboard-counts.directive.js:61
-#: client/src/organizations/linkout/organizations-linkout.route.js:206
+#: client/src/organizations/linkout/organizations-linkout.route.js:207
 msgid "Projects"
 msgstr ""
 
@@ -3499,31 +3534,26 @@ msgstr ""
 msgid "Prompt"
 msgstr ""
 
-#: client/lib/components/components.strings.js:30
-#: client/src/templates/job_templates/job-template.form.js:139
-#: client/src/templates/job_templates/job-template.form.js:169
-#: client/src/templates/job_templates/job-template.form.js:186
-#: client/src/templates/job_templates/job-template.form.js:212
-#: client/src/templates/job_templates/job-template.form.js:229
-#: client/src/templates/job_templates/job-template.form.js:254
-#: client/src/templates/job_templates/job-template.form.js:354
+#: client/lib/components/components.strings.js:34
+#: client/src/templates/job_templates/job-template.form.js:138
+#: client/src/templates/job_templates/job-template.form.js:168
+#: client/src/templates/job_templates/job-template.form.js:185
+#: client/src/templates/job_templates/job-template.form.js:202
+#: client/src/templates/job_templates/job-template.form.js:219
+#: client/src/templates/job_templates/job-template.form.js:265
+#: client/src/templates/job_templates/job-template.form.js:365
 #: client/src/templates/job_templates/job-template.form.js:60
 #: client/src/templates/job_templates/job-template.form.js:86
 msgid "Prompt on launch"
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:132
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:147
-msgid "Provide a comma separated list of tags."
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:184
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:266
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:238
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:252
 msgid "Provide a comma-separated list of filter expressions."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:200
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:284
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:254
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:270
 msgid "Provide a comma-separated list of filter expressions. Hosts are imported when all of the filters match. Refer to Ansible Tower documentation for more detail."
 msgstr ""
 
@@ -3533,25 +3563,25 @@ msgstr ""
 msgid "Provide a host name, ip address, or ip address:port. Examples include:"
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:163
+#: client/src/templates/job_templates/job-template.form.js:162
 msgid "Provide a host pattern to further constrain the list of hosts that will be managed or affected by the playbook. Multiple patterns are allowed. Refer to Ansible documentation for more information and examples on patterns."
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:116
-msgid "Provide a host pattern to further constrain the list of hosts that will be managed or affected by the playbook. Multiple patterns can be separated by %s %s or %s"
+#: client/features/credentials/credentials.strings.js:22
+msgid "Provide account information using Google Compute Engine JSON credentials file."
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:196
 msgid "Provide environment variables to pass to the custom inventory script."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:203
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:287
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:257
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:273
 msgid "Provide the named URL encoded name or id of the remote Tower inventory to be imported."
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:311
-#: client/src/templates/job_templates/job-template.form.js:319
+#: client/src/templates/job_templates/job-template.form.js:321
+#: client/src/templates/job_templates/job-template.form.js:329
 msgid "Provisioning Callback URL"
 msgstr ""
 
@@ -3560,11 +3590,7 @@ msgstr ""
 msgid "Purple"
 msgstr ""
 
-#: client/src/projects/factories/get-project-tool-tip.factory.js:14
-msgid "Queued. Click for details"
-msgstr ""
-
-#: client/src/configuration/auth-form/configuration-auth.controller.js:112
+#: client/src/configuration/auth-form/configuration-auth.controller.js:131
 msgid "RADIUS"
 msgstr ""
 
@@ -3592,22 +3618,20 @@ msgstr ""
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.list.js:113
 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:47
 #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:54
-#: client/src/jobs/jobs.partial.html:15
-#: client/src/portal-mode/portal-mode-jobs.partial.html:20
 #: client/src/projects/projects.list.js:71
-#: client/src/scheduler/schedules.list.js:61
+#: client/src/scheduler/schedules.list.js:69
 msgid "REFRESH"
 msgstr ""
 
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:109
-msgid "REGIONS"
+#: client/features/users/tokens/tokens.strings.js:23
+msgid "REFRESH TOKEN"
 msgstr ""
 
 #: client/src/shared/smart-search/smart-search.partial.html:48
 msgid "RELATED FIELDS:"
 msgstr ""
 
-#: client/src/shared/directives.js:78
+#: client/src/shared/directives.js:94
 msgid "REMOVE"
 msgstr ""
 
@@ -3615,16 +3639,15 @@ msgstr ""
 msgid "REPLACE"
 msgstr ""
 
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:7
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:7
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:7
+#: client/features/output/jobs.strings.js:8
 msgid "RESULTS"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:34
 #: client/lib/components/components.strings.js:8
 #: client/src/job-submission/job-submission.partial.html:44
 #: client/src/job-submission/job-submission.partial.html:87
-#: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:52
+#: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:60
 msgid "REVERT"
 msgstr ""
 
@@ -3650,14 +3673,18 @@ msgstr ""
 msgid "Random"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:411
-msgid "Read only view of extra variables added to the job template."
+#: client/features/users/tokens/tokens.strings.js:30
+msgid "Read"
 msgstr ""
 
 #: client/src/workflow-results/workflow-results.partial.html:155
 msgid "Read only view of extra variables added to the workflow."
 msgstr ""
 
+#: client/lib/components/code-mirror/code-mirror.strings.js:49
+msgid "Read-only view of extra variables added to the job template."
+msgstr ""
+
 #: client/src/notifications/notificationTemplates.list.js:26
 msgid "Recent Notifications"
 msgstr ""
@@ -3672,7 +3699,7 @@ msgstr ""
 msgid "Red"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:65
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:47
 msgid "Refer to the Ansible Tower documentation for further syntax and examples."
 msgstr ""
 
@@ -3686,12 +3713,12 @@ msgstr ""
 #: client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.list.js:43
 #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:50
 #: client/src/projects/projects.list.js:67
-#: client/src/scheduler/schedules.list.js:57
+#: client/src/scheduler/schedules.list.js:65
 msgid "Refresh the page"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:177
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:258
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:231
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:244
 msgid "Region:"
 msgstr ""
 
@@ -3703,27 +3730,31 @@ msgstr ""
 msgid "Related Groups"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:77
-#: client/src/job-results/job-results.partial.html:29
-#: client/src/jobs/all-jobs.list.js:99
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:11
-#: client/src/templates/completed-jobs.list.js:78
+#: client/lib/components/components.strings.js:89
+msgid "Relaunch On"
+msgstr ""
+
+#: client/lib/components/components.strings.js:88
+msgid "Relaunch using host parameters"
+msgstr ""
+
+#: client/lib/components/components.strings.js:87
 #: client/src/workflow-results/workflow-results.partial.html:29
 msgid "Relaunch using the same parameters"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:194
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:180
 msgid "Remediate Inventory"
 msgstr ""
 
-#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:96
-#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:97
-#: client/src/teams/teams.form.js:142
-#: client/src/users/users.form.js:222
+#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:102
+#: client/src/access/add-rbac-user-team/rbac-selected-list.directive.js:103
+#: client/src/teams/teams.form.js:145
+#: client/src/users/users.form.js:225
 msgid "Remove"
 msgstr ""
 
-#: client/src/projects/projects.form.js:158
+#: client/src/projects/projects.form.js:159
 msgid "Remove any local modifications prior to performing an update."
 msgstr ""
 
@@ -3739,15 +3770,28 @@ msgstr ""
 msgid "Required"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:153
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:154
 msgid "Reset"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:123
-msgid "Results Traceback"
+#: client/lib/components/components.strings.js:81
+msgid "Resources"
 msgstr ""
 
-#: client/src/shared/form-generator.js:690
+#: client/features/templates/templates.strings.js:88
+#: client/src/scheduler/schedules.list.js:24
+msgid "Resources are missing from this template."
+msgstr ""
+
+#: client/lib/services/base-string.service.js:85
+msgid "Return"
+msgstr ""
+
+#: client/features/users/tokens/tokens.strings.js:26
+msgid "Returned status:"
+msgstr ""
+
+#: client/src/shared/form-generator.js:699
 msgid "Revert"
 msgstr ""
 
@@ -3756,59 +3800,54 @@ msgstr ""
 #: client/src/configuration/auth-form/sub-forms/auth-github-team.form.js:51
 #: client/src/configuration/auth-form/sub-forms/auth-github.form.js:47
 #: client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js:59
-#: client/src/configuration/auth-form/sub-forms/auth-ldap.form.js:95
+#: client/src/configuration/auth-form/sub-forms/auth-ldap.form.js:102
+#: client/src/configuration/auth-form/sub-forms/auth-ldap1.form.js:102
+#: client/src/configuration/auth-form/sub-forms/auth-ldap2.form.js:102
+#: client/src/configuration/auth-form/sub-forms/auth-ldap3.form.js:102
+#: client/src/configuration/auth-form/sub-forms/auth-ldap4.form.js:102
+#: client/src/configuration/auth-form/sub-forms/auth-ldap5.form.js:102
 #: client/src/configuration/auth-form/sub-forms/auth-radius.form.js:34
-#: client/src/configuration/auth-form/sub-forms/auth-saml.form.js:87
+#: client/src/configuration/auth-form/sub-forms/auth-saml.form.js:121
 #: client/src/configuration/auth-form/sub-forms/auth-tacacs.form.js:47
 #: client/src/configuration/jobs-form/configuration-jobs.form.js:73
 #: client/src/configuration/system-form/sub-forms/system-activity-stream.form.js:26
 #: client/src/configuration/system-form/sub-forms/system-logging.form.js:74
-#: client/src/configuration/system-form/sub-forms/system-misc.form.js:50
+#: client/src/configuration/system-form/sub-forms/system-misc.form.js:53
 #: client/src/configuration/ui-form/configuration-ui.form.js:36
 msgid "Revert all to default"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:239
 #: client/src/projects/projects.list.js:50
 msgid "Revision"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:146
-#: client/src/projects/edit/projects-edit.controller.js:281
+#: client/src/projects/add/projects-add.controller.js:154
+#: client/src/projects/edit/projects-edit.controller.js:288
 msgid "Revision #"
 msgstr ""
 
-#: client/features/credentials/legacy.credentials.js:88
-#: client/src/credentials/credentials.form.js:461
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:148
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:149
-#: client/src/organizations/organizations.form.js:97
-#: client/src/projects/projects.form.js:255
-#: client/src/teams/teams.form.js:135
-#: client/src/teams/teams.form.js:98
-#: client/src/templates/workflows.form.js:138
-#: client/src/users/users.form.js:205
+#: client/features/credentials/legacy.credentials.js:85
+#: client/src/credentials/credentials.form.js:462
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:130
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:132
+#: client/src/organizations/organizations.form.js:109
+#: client/src/projects/projects.form.js:269
+#: client/src/teams/teams.form.js:101
+#: client/src/teams/teams.form.js:138
+#: client/src/templates/workflows.form.js:164
+#: client/src/users/users.form.js:208
 msgid "Role"
 msgstr ""
 
-#: client/src/instance-groups/instance-group.partial.html:14
 #: client/src/instance-groups/instance-groups.list.js:26
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:14
-#: client/src/instance-groups/instances/instances-list.partial.html:18
-#: client/src/instance-groups/instances/instances.list.js:24
-#: client/src/instance-groups/list/instance-groups-list.partial.html:29
 msgid "Running Jobs"
 msgstr ""
 
-#: client/src/projects/factories/get-project-tool-tip.factory.js:18
-msgid "Running! Click for details"
-msgstr ""
-
-#: client/src/configuration/auth-form/configuration-auth.controller.js:113
+#: client/src/configuration/auth-form/configuration-auth.controller.js:132
 msgid "SAML"
 msgstr ""
 
-#: client/lib/services/base-string.service.js:62
+#: client/lib/services/base-string.service.js:61
 #: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-host-filter/host-filter-modal/host-filter-modal.partial.html:17
 #: client/src/inventories-hosts/shared/associate-groups/associate-groups.partial.html:17
 #: client/src/inventories-hosts/shared/associate-hosts/associate-hosts.partial.html:17
@@ -3817,7 +3856,7 @@ msgstr ""
 msgid "SAVE"
 msgstr ""
 
-#: client/src/scheduler/main.js:331
+#: client/src/scheduler/main.js:325
 msgid "SCHEDULED"
 msgstr ""
 
@@ -3825,40 +3864,40 @@ msgstr ""
 msgid "SCHEDULED JOBS"
 msgstr ""
 
+#: client/features/jobs/index.view.html:12
 #: client/src/activity-stream/get-target-title.factory.js:38
 #: client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule.route.js:49
 #: client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule.route.js:8
 #: client/src/management-jobs/scheduler/main.js:26
 #: client/src/management-jobs/scheduler/main.js:32
-#: client/src/scheduler/main.js:145
-#: client/src/scheduler/main.js:183
-#: client/src/scheduler/main.js:235
-#: client/src/scheduler/main.js:273
-#: client/src/scheduler/main.js:52
-#: client/src/scheduler/main.js:90
+#: client/src/scheduler/main.js:139
+#: client/src/scheduler/main.js:177
+#: client/src/scheduler/main.js:229
+#: client/src/scheduler/main.js:267
+#: client/src/scheduler/main.js:86
 msgid "SCHEDULES"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:118
-#: client/src/projects/edit/projects-edit.controller.js:254
+#: client/src/projects/add/projects-add.controller.js:126
+#: client/src/projects/edit/projects-edit.controller.js:261
 msgid "SCM Branch"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:137
-#: client/src/projects/edit/projects-edit.controller.js:272
+#: client/src/projects/add/projects-add.controller.js:145
+#: client/src/projects/edit/projects-edit.controller.js:279
 msgid "SCM Branch/Tag/Commit"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:158
-#: client/src/projects/edit/projects-edit.controller.js:293
+#: client/src/projects/add/projects-add.controller.js:166
+#: client/src/projects/edit/projects-edit.controller.js:300
 msgid "SCM Branch/Tag/Revision"
 msgstr ""
 
-#: client/src/projects/projects.form.js:159
+#: client/src/projects/projects.form.js:160
 msgid "SCM Clean"
 msgstr ""
 
-#: client/src/projects/projects.form.js:170
+#: client/src/projects/projects.form.js:171
 msgid "SCM Delete"
 msgstr ""
 
@@ -3867,30 +3906,30 @@ msgstr ""
 msgid "SCM Private Key"
 msgstr ""
 
-#: client/src/projects/projects.form.js:55
+#: client/src/projects/projects.form.js:56
 msgid "SCM Type"
 msgstr ""
 
 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:49
-#: client/src/projects/projects.form.js:180
+#: client/src/projects/projects.form.js:181
 msgid "SCM Update"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:222
+#: client/src/projects/list/projects-list.controller.js:257
 msgid "SCM Update Cancel"
 msgstr ""
 
-#: client/src/projects/projects.form.js:150
+#: client/src/projects/projects.form.js:151
 msgid "SCM Update Options"
 msgstr ""
 
-#: client/src/projects/edit/projects-edit.controller.js:137
-#: client/src/projects/list/projects-list.controller.js:84
+#: client/src/projects/edit/projects-edit.controller.js:138
+#: client/src/projects/list/projects-list.controller.js:86
 msgid "SCM update currently running"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js:35
-#: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:70
+#: client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js:36
+#: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:84
 msgid "SELECT"
 msgstr ""
 
@@ -3898,6 +3937,11 @@ msgstr ""
 msgid "SELECT A CREDENTIAL TYPE"
 msgstr ""
 
+#: client/features/users/tokens/tokens.strings.js:19
+msgid "SELECT AN APPLICATION"
+msgstr ""
+
+#: client/features/applications/applications.strings.js:34
 #: client/features/credentials/credentials.strings.js:19
 msgid "SELECT AN ORGANIZATION"
 msgstr ""
@@ -3910,18 +3954,30 @@ msgstr ""
 msgid "SELECT HOSTS"
 msgstr ""
 
+#: client/src/instance-groups/instance-groups.strings.js:28
+msgid "SELECT INSTANCE"
+msgstr ""
+
+#: client/features/templates/templates.strings.js:31
+msgid "SELECTED"
+msgstr ""
+
 #: client/src/job-submission/job-submission.partial.html:29
 #: client/src/job-submission/job-submission.partial.html:56
-#: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:20
+#: client/src/templates/job_templates/multi-credential/multi-credential-modal.partial.html:18
 msgid "SELECTED:"
 msgstr ""
 
-#: client/src/main-menu/main-menu.partial.html:59
-#: client/src/setup-menu/setup.route.js:9
-msgid "SETTINGS"
+#: client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html:20
+msgid "SETTING CATEGORY"
+msgstr ""
+
+#: client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html:24
+msgid "SETTING NAME"
 msgstr ""
 
 #: client/lib/components/components.strings.js:11
+#: client/lib/services/base-string.service.js:64
 msgid "SHOW"
 msgstr ""
 
@@ -3934,14 +3990,10 @@ msgid "SIGN IN WITH"
 msgstr ""
 
 #: client/src/inventories-hosts/hosts/host.list.js:110
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:32
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:14
 msgid "SMART INVENTORY"
 msgstr ""
 
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:102
-msgid "SOURCE"
-msgstr ""
-
 #: client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js:26
 msgid "SOURCES"
 msgstr ""
@@ -3951,32 +4003,18 @@ msgstr ""
 msgid "SSH Key"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:40
+msgid "SSH Password"
+msgstr ""
+
 #: client/src/credentials/credentials.form.js:255
 msgid "SSH key description"
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.form.js:375
+#: client/src/notifications/notificationTemplates.form.js:446
 msgid "SSL Connection"
 msgstr ""
 
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:128
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:135
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:96
-msgid "STANDARD OUT"
-msgstr ""
-
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:32
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:65
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:45
-msgid "STARTED"
-msgstr ""
-
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:24
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:37
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:37
-msgid "STATUS"
-msgstr ""
-
 #: client/src/credentials/credentials.form.js:119
 #: client/src/credentials/credentials.form.js:127
 msgid "STS Token"
@@ -4005,23 +4043,23 @@ msgstr ""
 
 #: client/src/access/add-rbac-resource/rbac-resource.partial.html:110
 #: client/src/access/add-rbac-user-team/rbac-user-team.partial.html:193
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:157
-#: client/src/shared/form-generator.js:1691
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:158
+#: client/src/shared/form-generator.js:1700
 msgid "Save"
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:86
-#: client/src/configuration/configuration.controller.js:213
-#: client/src/configuration/configuration.controller.js:272
+#: client/src/configuration/auth-form/configuration-auth.controller.js:104
+#: client/src/configuration/configuration.controller.js:242
+#: client/src/configuration/configuration.controller.js:319
 #: client/src/configuration/system-form/configuration-system.controller.js:68
 msgid "Save changes"
 msgstr ""
 
-#: client/src/license/license.partial.html:127
+#: client/src/license/license.partial.html:140
 msgid "Save successful!"
 msgstr ""
 
-#: client/src/templates/templates.list.js:88
+#: client/src/templates/templates.list.js:93
 msgid "Schedule"
 msgstr ""
 
@@ -4029,25 +4067,25 @@ msgstr ""
 msgid "Schedule Management Job"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:75
-msgid "Schedule future SCM updates"
+#: client/src/projects/list/projects-list.controller.js:77
+msgid "Schedule SCM revision updates"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/sources/factories/get-sync-status-msg.factory.js:7
-msgid "Schedule future inventory syncs"
+msgid "Schedule inventory syncs"
 msgstr ""
 
-#: client/src/templates/templates.list.js:91
-msgid "Schedule future job template runs"
+#: client/src/templates/templates.list.js:96
+msgid "Schedule job template runs"
 msgstr ""
 
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:33
-#: client/src/jobs/jobs.partial.html:10
+#: client/lib/components/components.strings.js:61
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:34
 msgid "Schedules"
 msgstr ""
 
-#: client/src/shared/smart-search/smart-search.controller.js:49
-#: client/src/shared/smart-search/smart-search.controller.js:94
+#: client/src/shared/smart-search/smart-search.controller.js:108
+#: client/src/shared/smart-search/smart-search.controller.js:32
 msgid "Search"
 msgstr ""
 
@@ -4055,8 +4093,8 @@ msgstr ""
 msgid "Secret Key"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:178
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:259
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:232
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:245
 msgid "Security Group:"
 msgstr ""
 
@@ -4064,16 +4102,22 @@ msgstr ""
 msgid "Security Token Service (STS) is a web service that enables you to request temporary, limited-privilege credentials for AWS Identity and Access Management (IAM) users."
 msgstr ""
 
-#: client/src/shared/form-generator.js:1695
+#: client/src/shared/form-generator.js:1704
 msgid "Select"
 msgstr ""
 
+#: client/src/organizations/organizations.form.js:48
+#: client/src/projects/projects.form.js:209
+#: client/src/templates/job_templates/job-template.form.js:237
+msgid "Select Ansible Environment"
+msgstr ""
+
 #: client/src/shared/instance-groups-multiselect/instance-groups-modal/instance-groups-modal.partial.html:5
 msgid "Select Instance Groups"
 msgstr ""
 
-#: client/src/job-submission/job-submission.directive.js:64
-#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:46
+#: client/src/job-submission/job-submission.directive.js:65
+#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:66
 msgid "Select a credential"
 msgstr ""
 
@@ -4081,6 +4125,10 @@ msgstr ""
 msgid "Select a role"
 msgstr ""
 
+#: client/features/users/tokens/tokens.strings.js:29
+msgid "Select a scope"
+msgstr ""
+
 #: client/src/inventories-hosts/inventories/related/groups/groups.list.js:53
 msgid "Select an inventory source by clicking the check box beside it. The inventory source can be a single group or a selection of multiple groups."
 msgstr ""
@@ -4101,16 +4149,16 @@ msgstr ""
 msgid "Select commands"
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:133
+#: client/src/templates/job_templates/job-template.form.js:132
 msgid "Select credentials that allow Tower to access the nodes this job will be ran against. You can only select one credential of each type. For machine credentials (SSH), checking  \"Prompt on launch\" without selecting credentials will require you to select a machine credential at run time. If you select credentials and check \"Prompt on launch\", the selected credential(s) become the defaults that can be updated at run time."
 msgstr ""
 
-#: client/src/projects/projects.form.js:98
+#: client/src/projects/projects.form.js:99
 msgid "Select from the list of directories found in the Project Base Path. Together the base path and the playbook directory provide the full path used to locate playbooks."
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:263
-#: client/src/configuration/auth-form/configuration-auth.controller.js:282
+#: client/src/configuration/auth-form/configuration-auth.controller.js:343
+#: client/src/configuration/auth-form/configuration-auth.controller.js:362
 msgid "Select group types"
 msgstr ""
 
@@ -4118,15 +4166,15 @@ msgstr ""
 msgid "Select roles"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:74
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:56
 msgid "Select the Instance Groups for this Inventory to run on."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:80
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:63
 msgid "Select the Instance Groups for this Inventory to run on. Refer to the Ansible Tower documentation for more detail."
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:193
+#: client/src/templates/job_templates/job-template.form.js:249
 msgid "Select the Instance Groups for this Job Template to run on."
 msgstr ""
 
@@ -4134,12 +4182,19 @@ msgstr ""
 msgid "Select the Instance Groups for this Organization to run on."
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:60
-msgid "Select the credential you want the job to use when accessing the remote hosts. Choose the credential containing  the username and SSH key or password that Ansible will need to log into the remote hosts."
+#: client/src/templates/job_templates/job-template.form.js:239
+msgid "Select the custom Python virtual environment for this job template to run on."
+msgstr ""
+
+#: client/src/organizations/organizations.form.js:51
+msgid "Select the custom Python virtual environment for this organization to run on."
+msgstr ""
+
+#: client/src/projects/projects.form.js:211
+msgid "Select the custom Python virtual environment for this project to run on."
 msgstr ""
 
 #: client/src/templates/job_templates/job-template.form.js:79
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:81
 msgid "Select the inventory containing the hosts you want this job to manage."
 msgstr ""
 
@@ -4159,8 +4214,8 @@ msgstr ""
 msgid "Select types"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:170
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:251
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:224
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:237
 msgid "Select which groups to create automatically."
 msgstr ""
 
@@ -4173,15 +4228,11 @@ msgstr ""
 msgid "Service Account Email Address"
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:101
-msgid "Setting the type to %s will execute the playbook and store any  scanned facts for use with 's System Tracking feature."
+#: client/features/credentials/credentials.strings.js:21
+msgid "Service Account JSON File"
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:99
-msgid "Setting the type to %s will not execute the playbook. Instead, %s will check playbook  syntax, test environment setup and report problems."
-msgstr ""
-
-#: client/src/main-menu/main-menu.partial.html:147
+#: client/lib/components/components.strings.js:77
 msgid "Settings"
 msgstr ""
 
@@ -4190,14 +4241,16 @@ msgstr ""
 #: client/src/job-submission/job-submission.partial.html:136
 #: client/src/job-submission/job-submission.partial.html:150
 #: client/src/job-submission/job-submission.partial.html:299
-#: client/src/shared/form-generator.js:876
+#: client/src/shared/form-generator.js:885
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:24
 msgid "Show"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:114
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:117
-#: client/src/templates/job_templates/job-template.form.js:245
-#: client/src/templates/job_templates/job-template.form.js:248
+#: client/features/templates/templates.strings.js:45
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:115
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:118
+#: client/src/templates/job_templates/job-template.form.js:256
+#: client/src/templates/job_templates/job-template.form.js:259
 msgid "Show Changes"
 msgstr ""
 
@@ -4216,32 +4269,26 @@ msgstr ""
 msgid "Sign in with %s Teams"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:395
+#: client/features/templates/templates.strings.js:46
 #: client/src/job-submission/job-submission.partial.html:245
-#: client/src/templates/job_templates/job-template.form.js:217
-#: client/src/templates/job_templates/job-template.form.js:224
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:142
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:150
+#: client/src/templates/job_templates/job-template.form.js:207
+#: client/src/templates/job_templates/job-template.form.js:214
 msgid "Skip Tags"
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:148
-msgid "Skip tags are useful when you have a large playbook, and you want to skip specific parts of a play or task."
-msgstr ""
-
-#: client/src/templates/job_templates/job-template.form.js:223
+#: client/src/templates/job_templates/job-template.form.js:213
 msgid "Skip tags are useful when you have a large playbook, and you want to skip specific parts of a play or task. Use commas to separate multiple tags. Refer to Ansible Tower documentation for details on the usage of tags."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:62
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:66
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:44
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:48
 msgid "Smart Host Filter"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/inventory.list.js:85
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:69
+#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:71
 #: client/src/organizations/linkout/controllers/organizations-inventories.controller.js:70
-#: client/src/shared/form-generator.js:1456
+#: client/src/shared/form-generator.js:1465
 msgid "Smart Inventory"
 msgstr ""
 
@@ -4259,7 +4306,7 @@ msgid "Source Control"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:47
-#: client/src/projects/projects.form.js:25
+#: client/src/projects/projects.form.js:26
 msgid "Source Details"
 msgstr ""
 
@@ -4290,7 +4337,7 @@ msgid "Source Vars"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:34
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:184
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:167
 msgid "Sources"
 msgstr ""
 
@@ -4302,17 +4349,21 @@ msgstr ""
 msgid "Specify a method for %s operations. This is equivalent to specifying the %s parameter, where %s could be %s"
 msgstr ""
 
+#: client/src/notifications/notificationTemplates.form.js:478
+msgid "Specify a notification color. Acceptable colors are hex color code (example: #3af or #789abc) ."
+msgstr ""
+
 #: client/src/notifications/notificationTemplates.form.js:292
 msgid "Specify a notification color. Acceptable colors are: yellow, green, red purple, gray or random."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:199
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:283
-msgid "Specify which groups to create automatically. Group names will be created similar to the options selected. If blank, all groups above are created. Refer to Ansible Tower documentation for more detail."
+#: client/features/users/tokens/tokens.strings.js:20
+msgid "Specify a scope for the token's access"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:17
-msgid "Split up your organization to associate content and control permissions for groups."
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:253
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:269
+msgid "Specify which groups to create automatically. Group names will be created similar to the options selected. If blank, all groups above are created. Refer to Ansible Tower documentation for more detail."
 msgstr ""
 
 #: client/src/partials/logviewer.html:5
@@ -4327,46 +4378,34 @@ msgstr ""
 msgid "Start Time"
 msgstr ""
 
-#: client/src/portal-mode/portal-job-templates.list.js:39
-#: client/src/templates/templates.list.js:83
+#: client/lib/components/components.strings.js:95
 msgid "Start a job using this template"
 msgstr ""
 
-#: client/src/projects/edit/projects-edit.controller.js:134
-#: client/src/projects/list/projects-list.controller.js:74
-msgid "Start an SCM update"
-msgstr ""
-
 #: client/src/inventories-hosts/inventories/related/sources/factories/get-sync-status-msg.factory.js:6
 msgid "Start sync process"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:100
+#: client/features/jobs/jobs.strings.js:8
 msgid "Started"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/list/host-summary-popover/host-summary-popover.directive.js:53
 #: client/src/inventories-hosts/inventories/list/source-summary-popover/source-summary-popover.directive.js:55
 #: client/src/inventories-hosts/shared/factories/set-status.factory.js:43
-#: client/src/job-results/job-results.partial.html:67
-#: client/src/job-results/parse-stdout.service.js:68
 #: client/src/notifications/notification-templates-list/list.controller.js:71
 #: client/src/partials/logviewer.html:4
 msgid "Status"
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.partial.html:3
+#: client/src/configuration/auth-form/configuration-auth.partial.html:4
 msgid "Sub Category"
 msgstr ""
 
-#: client/src/license/license.partial.html:126
+#: client/src/license/license.partial.html:139
 msgid "Submit"
 msgstr ""
 
-#: client/src/jobs/factories/delete-job.factory.js:109
-msgid "Submit the request to cancel?"
-msgstr ""
-
 #: client/src/license/license.partial.html:27
 msgid "Subscription"
 msgstr ""
@@ -4380,24 +4419,21 @@ msgstr ""
 msgid "Subscription ID is an Azure construct, which is mapped to a username."
 msgstr ""
 
-#: client/src/notifications/notifications.list.js:38
+#: client/src/notifications/notifications.list.js:39
 msgid "Success"
 msgstr ""
 
-#: client/src/projects/factories/get-project-tool-tip.factory.js:21
-msgid "Success! Click for details"
-msgstr ""
-
 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:77
 msgid "Successful"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:27
 #: client/src/job-submission/job-submission.partial.html:20
 msgid "Survey"
 msgstr ""
 
-#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:60
-#: client/src/templates/workflows/edit-workflow/workflow-edit.controller.js:64
+#: client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js:62
+#: client/src/templates/workflows/edit-workflow/workflow-edit.controller.js:262
 msgid "Surveys allow users to be prompted at job launch with a series of questions related to the job. This allows for variables to be defined that affect the playbook run at time of launch."
 msgstr ""
 
@@ -4433,7 +4469,7 @@ msgstr ""
 msgid "Sync running. Click to view log."
 msgstr ""
 
-#: client/src/configuration/configuration.partial.html:17
+#: client/src/configuration/configuration.partial.html:29
 msgid "System"
 msgstr ""
 
@@ -4453,23 +4489,23 @@ msgstr ""
 msgid "System auditors have read-only permissions in this section."
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:114
+#: client/src/configuration/auth-form/configuration-auth.controller.js:133
 msgid "TACACS+"
 msgstr ""
 
 #: client/src/activity-stream/get-target-title.factory.js:23
-#: client/src/organizations/linkout/organizations-linkout.route.js:97
-#: client/src/organizations/list/organizations-list.controller.js:60
-#: client/src/teams/main.js:46
+#: client/src/organizations/linkout/organizations-linkout.route.js:98
+#: client/src/organizations/list/organizations-list.controller.js:61
+#: client/src/teams/main.js:65
 #: client/src/teams/teams.list.js:14
 #: client/src/teams/teams.list.js:15
 msgid "TEAMS"
 msgstr ""
 
+#: client/features/templates/routes/templatesList.route.js:12
+#: client/features/templates/templates.strings.js:12
+#: client/features/templates/templates.strings.js:8
 #: client/src/activity-stream/get-target-title.factory.js:44
-#: client/src/main-menu/main-menu.partial.html:113
-#: client/src/main-menu/main-menu.partial.html:35
-#: client/src/templates/list/templates-list.route.js:13
 #: client/src/templates/templates.list.js:15
 #: client/src/templates/templates.list.js:16
 msgid "TEMPLATES"
@@ -4483,60 +4519,69 @@ msgstr ""
 msgid "TIME"
 msgstr ""
 
-#: client/src/job-results/job-results-stdout/job-results-stdout.partial.html:61
-msgid "TOP"
+#: client/features/users/tokens/tokens.strings.js:22
+msgid "TOKEN"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:181
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:262
+#: client/features/users/tokens/tokens.strings.js:21
+msgid "TOKEN INFORMATION"
+msgstr ""
+
+#: client/features/applications/applications.strings.js:11
+#: client/features/users/tokens/tokens.strings.js:10
+#: client/features/users/tokens/tokens.strings.js:8
+#: client/features/users/tokens/users-tokens-list.route.js:11
+msgid "TOKENS"
+msgstr ""
+
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:235
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:248
 msgid "Tag None:"
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:133
-msgid "Tags are useful when you have a large playbook, and you want to run a specific part of a play or task."
-msgstr ""
-
-#: client/src/templates/job_templates/job-template.form.js:206
+#: client/src/templates/job_templates/job-template.form.js:196
 msgid "Tags are useful when you have a large playbook, and you want to run a specific part of a play or task. Use commas to separate multiple tags. Refer to Ansible Tower documentation for details on the usage of tags."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:179
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:260
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:233
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:246
 msgid "Tags:"
 msgstr ""
 
 #: client/src/notifications/notificationTemplates.form.js:309
+#: client/src/notifications/notificationTemplates.form.js:337
+#: client/src/notifications/notificationTemplates.form.js:376
 msgid "Target URL"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:496
-msgid "Tasks"
-msgstr ""
-
-#: client/features/credentials/legacy.credentials.js:94
-#: client/src/credentials/credentials.form.js:467
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:154
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:155
-#: client/src/projects/projects.form.js:261
-#: client/src/templates/workflows.form.js:144
+#: client/features/credentials/legacy.credentials.js:91
+#: client/src/credentials/credentials.form.js:468
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:136
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:138
+#: client/src/projects/projects.form.js:275
+#: client/src/templates/workflows.form.js:170
 msgid "Team Roles"
 msgstr ""
 
+#: client/lib/components/components.strings.js:70
 #: client/src/access/add-rbac-resource/rbac-resource.partial.html:40
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:34
-#: client/src/organizations/linkout/organizations-linkout.route.js:108
-#: client/src/setup-menu/setup-menu.partial.html:16
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:35
+#: client/src/organizations/linkout/organizations-linkout.route.js:109
 #: client/src/shared/stateDefinitions.factory.js:410
-#: client/src/users/users.form.js:159
+#: client/src/users/users.form.js:162
 msgid "Teams"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:135
 #: client/src/templates/templates.list.js:14
 msgid "Template"
 msgstr ""
 
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:35
+#: client/features/templates/templates.strings.js:66
+msgid "Template parameter is missing."
+msgstr ""
+
+#: client/lib/components/components.strings.js:67
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:36
 msgid "Templates"
 msgstr ""
 
@@ -4548,16 +4593,16 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.list.js:67
+#: client/src/notifications/notificationTemplates.list.js:77
 msgid "Test notification"
 msgstr ""
 
-#: client/src/shared/form-generator.js:1386
-#: client/src/shared/form-generator.js:1392
+#: client/src/shared/form-generator.js:1395
+#: client/src/shared/form-generator.js:1401
 msgid "That value was not found.  Please enter or select a valid value."
 msgstr ""
 
-#: client/lib/components/components.strings.js:43
+#: client/lib/components/components.strings.js:47
 msgid "That value was not found. Please enter or select a valid value."
 msgstr ""
 
@@ -4570,20 +4615,16 @@ msgstr ""
 msgid "The Project ID is the GCE assigned identification. It is constructed as two words followed by a three digit number.  Such as:"
 msgstr ""
 
-#: client/src/projects/edit/projects-edit.controller.js:332
+#: client/src/projects/edit/projects-edit.controller.js:339
 msgid "The SCM update process is running."
 msgstr ""
 
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:70
-msgid "The credential used to run this command."
-msgstr ""
-
 #: client/src/credentials/credentials.form.js:190
 msgid "The email address assigned to the Google Compute Engine %sservice account."
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:513
-msgid "The host count will update when the job is complete."
+#: client/features/output/jobs.strings.js:12
+msgid "The host status bar will update when the job is complete."
 msgstr ""
 
 #: client/src/credentials/factories/become-method-change.factory.js:62
@@ -4595,38 +4636,26 @@ msgstr ""
 msgid "The host value"
 msgstr ""
 
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:61
-msgid "The inventory this command ran on."
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:101
+#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:136
 msgid "The inventory will be in a pending status until the final delete is processed."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:104
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:105
 msgid "The number of parallel or simultaneous processes to use while executing the playbook. Inputting no value will use the default value from the %sansible configuration file%s."
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:152
+#: client/src/templates/job_templates/job-template.form.js:151
 msgid "The number of parallel or simultaneous processes to use while executing the playbook. Value defaults to 0. Refer to the Ansible documentation for details about the configuration file."
 msgstr ""
 
-#: client/src/job-results/job-results.controller.js:619
-msgid "The output is too large to display. Please download."
-msgstr ""
-
 #: client/src/credentials/factories/kind-change.factory.js:59
 msgid "The project value"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:159
+#: client/src/projects/list/projects-list.controller.js:176
 msgid "The selected project is not configured for SCM. To configure for SCM, edit the project and provide SCM settings, and then run an update."
 msgstr ""
 
-#: client/src/job-results/job-results-stdout/job-results-stdout.partial.html:42
-msgid "The standard output is too large to display.  Please specify additional filters to narrow the standard out."
-msgstr ""
-
 #: client/src/templates/survey-maker/shared/question-definition.form.js:52
 msgid "The suggested format for variable names is lowercase and underscore-separated (for example, foo_bar, user_id, host_name, etc.). Variable names with spaces are not allowed."
 msgstr ""
@@ -4635,8 +4664,8 @@ msgstr ""
 msgid "The time must be in HH24:MM:SS format."
 msgstr ""
 
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:79
-msgid "The user who ran this command."
+#: client/lib/services/base-string.service.js:76
+msgid "The {{ resourceType }} is currently being used by other resources."
 msgstr ""
 
 #: client/src/activity-stream/streams.list.js:17
@@ -4647,31 +4676,35 @@ msgstr ""
 msgid "There are no job templates to display at this time"
 msgstr ""
 
-#: client/src/portal-mode/portal-jobs.list.js:18
-msgid "There are no jobs to display at this time"
+#: client/features/jobs/jobs.strings.js:16
+msgid "There are no running jobs."
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:150
+#: client/src/projects/list/projects-list.controller.js:152
 msgid "There is no SCM update information available for this project. An update has not yet been  completed.  If you have not already done so, start an update for this project."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:140
+#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:142
 msgid "There was an error deleting inventory source groups. Returned status:"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:130
+#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:132
 msgid "There was an error deleting inventory source hosts. Returned status:"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:167
+#: client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js:169
 msgid "There was an error deleting inventory source. Returned status:"
 msgstr ""
 
-#: client/src/configuration/configuration.controller.js:349
+#: client/src/configuration/configuration.controller.js:142
+msgid "There was an error getting config values:"
+msgstr ""
+
+#: client/src/configuration/configuration.controller.js:403
 msgid "There was an error resetting value. Returned status:"
 msgstr ""
 
-#: client/src/configuration/configuration.controller.js:531
+#: client/src/configuration/configuration.controller.js:584
 msgid "There was an error resetting values. Returned status:"
 msgstr ""
 
@@ -4683,6 +4716,14 @@ msgstr ""
 msgid "These are the modules that {{BRAND_NAME}} supports running commands against."
 msgstr ""
 
+#: client/features/templates/templates.strings.js:96
+msgid "This Job Template is missing a default inventory or project. This must be addressed in the Job Template form before this node can be saved."
+msgstr ""
+
+#: client/src/credential-types/credential-types.strings.js:8
+msgid "This credential type is currently being used by one or more credentials.  Credentials that use this credential type must be deleted before the credential type can be deleted."
+msgstr ""
+
 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24
 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:25
 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:26
@@ -4701,6 +4742,10 @@ msgstr ""
 msgid "This is the tenant name.  This value is usually the same  as the username."
 msgstr ""
 
+#: client/features/templates/templates.strings.js:62
+msgid "This job template has a default {{typeLabel}} credential which must be included or replaced before proceeding."
+msgstr ""
+
 #: client/src/notifications/notifications.list.js:21
 msgid "This list is populated by notification templates added from the %sNotifications%s section"
 msgstr ""
@@ -4709,20 +4754,20 @@ msgstr ""
 msgid "This machine has not checked in with Insights in {{last_check_in}} hours"
 msgstr ""
 
-#: client/src/shared/form-generator.js:746
+#: client/src/shared/form-generator.js:755
 msgid "This setting has been set manually in a settings file and is now disabled."
 msgstr ""
 
-#: client/src/users/users.form.js:164
+#: client/src/users/users.form.js:167
 msgid "This user is not a member of any teams"
 msgstr ""
 
-#: client/src/shared/form-generator.js:856
-#: client/src/shared/form-generator.js:951
+#: client/src/shared/form-generator.js:865
+#: client/src/shared/form-generator.js:960
 msgid "This value does not match the password you entered previously.  Please confirm that password."
 msgstr ""
 
-#: client/src/configuration/configuration.controller.js:556
+#: client/src/configuration/configuration.controller.js:609
 msgid "This will reset all configuration values to their factory defaults. Are you sure you want to proceed?"
 msgstr ""
 
@@ -4736,7 +4781,7 @@ msgstr ""
 msgid "Time Remaining"
 msgstr ""
 
-#: client/src/projects/projects.form.js:196
+#: client/src/projects/projects.form.js:197
 msgid "Time in seconds to consider a project to be current. During job runs and callbacks the task system will evaluate the timestamp of the latest project update. If it is older than Cache Timeout, it is not considered current, and a new project update will be performed."
 msgstr ""
 
@@ -4748,17 +4793,18 @@ msgstr ""
 msgid "To learn more about the IAM STS Token, refer to the %sAmazon documentation%s."
 msgstr ""
 
-#: client/src/shared/form-generator.js:881
+#: client/src/shared/form-generator.js:890
 msgid "Toggle the display of plaintext."
 msgstr ""
 
-#: client/src/notifications/shared/type-change.service.js:34
-#: client/src/notifications/shared/type-change.service.js:40
+#: client/src/notifications/shared/type-change.service.js:36
+#: client/src/notifications/shared/type-change.service.js:42
 msgid "Token"
 msgstr ""
 
-#: client/src/job-results/job-results-stdout/job-results-stdout.partial.html:44
-msgid "Too much previous output to display.  Showing running standard output."
+#: client/features/applications/applications.strings.js:16
+#: client/src/users/users.form.js:236
+msgid "Tokens"
 msgstr ""
 
 #: client/src/inventories-hosts/inventories/insights/insights.partial.html:10
@@ -4771,22 +4817,16 @@ msgstr ""
 
 #: client/src/credentials/credentials.form.js:60
 #: client/src/credentials/credentials.form.js:84
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:52
-#: client/src/instance-groups/jobs/jobs.list.js:51
 #: client/src/inventories-hosts/inventories/inventory.list.js:55
-#: client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js:52
 #: client/src/inventories-hosts/inventories/related/sources/sources.list.js:41
-#: client/src/jobs/all-jobs.list.js:59
 #: client/src/notifications/notificationTemplates.form.js:54
 #: client/src/notifications/notificationTemplates.list.js:39
-#: client/src/notifications/notifications.list.js:31
+#: client/src/notifications/notifications.list.js:32
 #: client/src/projects/projects.list.js:44
 #: client/src/scheduler/scheduled-jobs.list.js:42
-#: client/src/teams/teams.form.js:130
-#: client/src/templates/completed-jobs.list.js:53
+#: client/src/teams/teams.form.js:133
 #: client/src/templates/templates.list.js:31
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:27
-#: client/src/users/users.form.js:200
+#: client/src/users/users.form.js:203
 msgid "Type"
 msgstr ""
 
@@ -4796,8 +4836,8 @@ msgstr ""
 msgid "Type Details"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:169
-#: client/src/projects/edit/projects-edit.controller.js:304
+#: client/src/projects/add/projects-add.controller.js:177
+#: client/src/projects/edit/projects-edit.controller.js:311
 msgid "URL popover text"
 msgstr ""
 
@@ -4806,39 +4846,91 @@ msgid "USERNAME"
 msgstr ""
 
 #: client/src/activity-stream/get-target-title.factory.js:20
-#: client/src/organizations/linkout/organizations-linkout.route.js:42
-#: client/src/organizations/list/organizations-list.controller.js:54
-#: client/src/users/main.js:46
+#: client/src/organizations/linkout/organizations-linkout.route.js:43
+#: client/src/organizations/list/organizations-list.controller.js:55
+#: client/src/users/main.js:67
 #: client/src/users/users.list.js:18
 #: client/src/users/users.list.js:19
 msgid "USERS"
 msgstr ""
 
-#: client/lib/components/components.strings.js:20
+#: client/lib/components/components.strings.js:24
 msgid "Unable to Submit"
 msgstr ""
 
-#: client/lib/components/components.strings.js:52
+#: client/features/templates/templates.strings.js:87
+msgid "Unable to copy template."
+msgstr ""
+
+#: client/src/instance-groups/instance-groups.strings.js:43
+msgid "Unable to delete instance group."
+msgstr ""
+
+#: client/features/templates/templates.strings.js:83
+msgid "Unable to delete template."
+msgstr ""
+
+#: client/features/templates/templates.strings.js:85
+msgid "Unable to determine template type."
+msgstr ""
+
+#: client/features/templates/templates.strings.js:68
+msgid "Unable to determine this template's type while copying."
+msgstr ""
+
+#: client/features/templates/templates.strings.js:69
+msgid "Unable to determine this template's type while deleting."
+msgstr ""
+
+#: client/features/templates/templates.strings.js:70
+msgid "Unable to determine this template's type while editing."
+msgstr ""
+
+#: client/features/templates/templates.strings.js:71
+msgid "Unable to determine this template's type while launching."
+msgstr ""
+
+#: client/features/templates/templates.strings.js:72
+msgid "Unable to determine this template's type while scheduling."
+msgstr ""
+
+#: client/features/templates/templates.strings.js:82
+msgid "Unable to edit template."
+msgstr ""
+
+#: client/features/templates/templates.strings.js:84
+msgid "Unable to launch template."
+msgstr ""
+
+#: client/features/templates/templates.strings.js:86
+msgid "Unable to schedule job."
+msgstr ""
+
+#: client/src/instance-groups/instance-groups.strings.js:33
+msgid "Unavailable"
+msgstr ""
+
+#: client/src/instance-groups/instance-groups.strings.js:32
 msgid "Unavailable to run jobs."
 msgstr ""
 
-#: client/lib/components/components.strings.js:22
+#: client/lib/components/components.strings.js:26
 msgid "Unexpected Error"
 msgstr ""
 
-#: client/lib/components/components.strings.js:21
+#: client/lib/components/components.strings.js:25
 msgid "Unexpected server error. View the console for more information"
 msgstr ""
 
-#: client/lib/components/components.strings.js:34
+#: client/lib/components/components.strings.js:38
 msgid "Unsupported display model type"
 msgstr ""
 
-#: client/lib/components/components.strings.js:26
+#: client/lib/components/components.strings.js:30
 msgid "Unsupported input type"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:266
+#: client/src/projects/list/projects-list.controller.js:301
 msgid "Update Not Found"
 msgstr ""
 
@@ -4846,13 +4938,28 @@ msgstr ""
 msgid "Update Options"
 msgstr ""
 
-#: client/src/projects/edit/projects-edit.controller.js:332
+#: client/src/projects/projects.form.js:178
+msgid "Update Revision on Launch"
+msgstr ""
+
+#: client/src/projects/factories/get-project-tool-tip.factory.js:30
+msgid "Update canceled. Click for details"
+msgstr ""
+
+#: client/src/projects/factories/get-project-tool-tip.factory.js:24
+msgid "Update failed. Click for details"
+msgstr ""
+
+#: client/src/projects/edit/projects-edit.controller.js:339
 msgid "Update in Progress"
 msgstr ""
 
+#: client/src/projects/factories/get-project-tool-tip.factory.js:27
+msgid "Update missing. Click for details"
+msgstr ""
+
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:352
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:357
-#: client/src/projects/projects.form.js:177
 msgid "Update on Launch"
 msgstr ""
 
@@ -4864,50 +4971,55 @@ msgstr ""
 msgid "Update on Project Update"
 msgstr ""
 
+#: client/src/projects/factories/get-project-tool-tip.factory.js:14
+msgid "Update queued. Click for details"
+msgstr ""
+
+#: client/src/projects/factories/get-project-tool-tip.factory.js:18
+msgid "Update running. Click for details"
+msgstr ""
+
+#: client/src/projects/factories/get-project-tool-tip.factory.js:21
+msgid "Update succeeded. Click for details"
+msgstr ""
+
 #: client/src/license/license.partial.html:71
 msgid "Upgrade"
 msgstr ""
 
-#: client/src/templates/job_templates/job-template.form.js:299
-#: client/src/templates/job_templates/job-template.form.js:304
+#: client/src/templates/job_templates/job-template.form.js:309
+#: client/src/templates/job_templates/job-template.form.js:314
 msgid "Use Fact Cache"
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.form.js:395
+#: client/src/notifications/notificationTemplates.form.js:466
 msgid "Use SSL"
 msgstr ""
 
-#: client/src/notifications/notificationTemplates.form.js:390
+#: client/src/notifications/notificationTemplates.form.js:461
 msgid "Use TLS"
 msgstr ""
 
-#: client/src/instance-groups/instance-group.partial.html:10
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs.partial.html:10
-#: client/src/instance-groups/instances/instances-list.partial.html:21
-#: client/src/instance-groups/list/instance-groups-list.partial.html:32
-msgid "Used Capacity"
-msgstr ""
-
 #: client/src/credentials/credentials.form.js:76
 msgid "Used to check out and synchronize playbook repositories with a remote source control management system such as Git, Subversion (svn), or Mercurial (hg). These credentials are used by Projects."
 msgstr ""
 
-#: client/features/credentials/legacy.credentials.js:83
-#: client/src/credentials/credentials.form.js:456
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:143
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:144
-#: client/src/organizations/organizations.form.js:92
-#: client/src/projects/projects.form.js:250
-#: client/src/teams/teams.form.js:93
-#: client/src/templates/workflows.form.js:133
+#: client/features/credentials/legacy.credentials.js:80
+#: client/src/credentials/credentials.form.js:457
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:125
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:127
+#: client/src/organizations/organizations.form.js:104
+#: client/src/projects/projects.form.js:264
+#: client/src/teams/teams.form.js:96
+#: client/src/templates/workflows.form.js:159
 msgid "User"
 msgstr ""
 
-#: client/src/configuration/configuration.partial.html:18
+#: client/src/configuration/configuration.partial.html:36
 msgid "User Interface"
 msgstr ""
 
-#: client/src/users/users.form.js:95
+#: client/src/users/users.form.js:98
 msgid "User Type"
 msgstr ""
 
@@ -4918,8 +5030,10 @@ msgstr ""
 #: client/src/credentials/factories/kind-change.factory.js:41
 #: client/src/credentials/factories/kind-change.factory.js:74
 #: client/src/credentials/factories/kind-change.factory.js:95
+#: client/src/notifications/notificationTemplates.form.js:348
+#: client/src/notifications/notificationTemplates.form.js:387
 #: client/src/notifications/notificationTemplates.form.js:64
-#: client/src/users/users.form.js:58
+#: client/src/users/users.form.js:61
 #: client/src/users/users.list.js:29
 msgid "Username"
 msgstr ""
@@ -4928,33 +5042,29 @@ msgstr ""
 msgid "Usernames, passwords, and access keys for authenticating to the specified cloud or infrastructure provider. These are used for smart inventory sources and for cloud provisioning and deployment in playbook runs."
 msgstr ""
 
+#: client/lib/components/components.strings.js:69
 #: client/src/access/add-rbac-resource/rbac-resource.partial.html:35
-#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:36
-#: client/src/organizations/organizations.form.js:74
-#: client/src/setup-menu/setup-menu.partial.html:10
-#: client/src/teams/teams.form.js:75
+#: client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js:37
+#: client/src/organizations/organizations.form.js:86
+#: client/src/teams/teams.form.js:78
 msgid "Users"
 msgstr ""
 
+#: client/lib/components/code-mirror/code-mirror.strings.js:9
+msgid "VARIABLES"
+msgstr ""
+
 #: client/src/home/dashboard/lists/job-templates/job-templates-list.partial.html:7
 #: client/src/home/dashboard/lists/jobs/jobs-list.partial.html:7
 msgid "VIEW ALL"
 msgstr ""
 
-#: client/src/main-menu/main-menu.partial.html:75
-msgid "VIEW DOCUMENTATION"
-msgstr ""
-
 #: client/src/shared/paginate/paginate.partial.html:48
 msgid "VIEW PER PAGE"
 msgstr ""
 
-#: client/src/main-menu/main-menu.partial.html:51
-msgid "VIEW USER PAGE FOR {{ $root.current_user.username | uppercase }}"
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:180
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:261
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:234
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:247
 msgid "VPC ID:"
 msgstr ""
 
@@ -4967,9 +5077,9 @@ msgstr ""
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.form.js:47
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:67
 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:67
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:81
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:88
-#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:94
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:63
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:71
+#: client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js:77
 msgid "Variables"
 msgstr ""
 
@@ -4977,24 +5087,24 @@ msgstr ""
 msgid "Vault"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:321
-msgid "Vault Credential"
+#: client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js:25
+msgid "Vault ID"
 msgstr ""
 
+#: client/features/templates/templates.strings.js:43
 #: client/src/credentials/credentials.form.js:391
 #: client/src/job-submission/job-submission.partial.html:146
 msgid "Vault Password"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:81
-#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:90
+#: client/features/templates/templates.strings.js:50
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:82
+#: client/src/inventories-hosts/inventories/adhoc/adhoc.form.js:91
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:307
 #: client/src/inventories-hosts/inventories/related/sources/sources.form.js:314
-#: client/src/job-results/job-results.partial.html:358
 #: client/src/job-submission/job-submission.partial.html:183
-#: client/src/standard-out/adhoc/standard-out-adhoc.partial.html:99
-#: client/src/templates/job_templates/job-template.form.js:174
-#: client/src/templates/job_templates/job-template.form.js:181
+#: client/src/templates/job_templates/job-template.form.js:173
+#: client/src/templates/job_templates/job-template.form.js:180
 msgid "Verbosity"
 msgstr ""
 
@@ -5004,14 +5114,14 @@ msgstr ""
 
 #: client/src/activity-stream/streams.list.js:63
 #: client/src/credential-types/credential-types.list.js:64
-#: client/src/credentials/credentials.list.js:75
+#: client/src/credentials/credentials.list.js:82
 #: client/src/home/dashboard/graphs/dashboard-graphs.partial.html:58
-#: client/src/inventories-hosts/inventories/inventory.list.js:104
-#: client/src/inventory-scripts/inventory-scripts.list.js:62
-#: client/src/notifications/notificationTemplates.list.js:82
-#: client/src/scheduler/schedules.list.js:83
+#: client/src/inventories-hosts/inventories/inventory.list.js:119
+#: client/src/inventory-scripts/inventory-scripts.list.js:70
+#: client/src/notifications/notificationTemplates.list.js:91
+#: client/src/scheduler/schedules.list.js:91
 #: client/src/teams/teams.list.js:64
-#: client/src/templates/templates.list.js:112
+#: client/src/templates/templates.list.js:108
 #: client/src/users/users.list.js:70
 msgid "View"
 msgstr ""
@@ -5020,11 +5130,11 @@ msgstr ""
 msgid "View Activity Stream"
 msgstr ""
 
-#: client/src/main-menu/main-menu.partial.html:173
+#: client/lib/components/components.strings.js:57
 msgid "View Documentation"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:79
+#: client/src/inventories-hosts/inventories/related/hosts/related-host.list.js:86
 msgid "View Insights Data"
 msgstr ""
 
@@ -5037,7 +5147,7 @@ msgstr ""
 #: client/src/inventories-hosts/hosts/host.form.js:78
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:77
 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:77
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:91
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:73
 msgid "View JSON examples at %s"
 msgstr ""
 
@@ -5049,9 +5159,13 @@ msgstr ""
 msgid "View More"
 msgstr ""
 
-#: client/src/shared/form-generator.js:1719
-#: client/src/templates/job_templates/job-template.form.js:436
-#: client/src/templates/workflows.form.js:161
+#: client/features/output/jobs.strings.js:24
+msgid "View Project checkout results"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1728
+#: client/src/templates/job_templates/job-template.form.js:449
+#: client/src/templates/workflows.form.js:187
 msgid "View Survey"
 msgstr ""
 
@@ -5064,19 +5178,11 @@ msgstr ""
 #: client/src/inventories-hosts/hosts/host.form.js:79
 #: client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.form.js:78
 #: client/src/inventories-hosts/inventories/related/hosts/related-host.form.js:78
-#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:92
+#: client/src/inventories-hosts/inventories/smart-inventory/smart-inventory.form.js:74
 msgid "View YAML examples at %s"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:72
-msgid "View Your License"
-msgstr ""
-
-#: client/src/setup-menu/setup-menu.partial.html:73
-msgid "View and edit your license information."
-msgstr ""
-
-#: client/src/credentials/credentials.list.js:77
+#: client/src/credentials/credentials.list.js:84
 msgid "View credential"
 msgstr ""
 
@@ -5100,31 +5206,19 @@ msgstr ""
 msgid "View host"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:67
-msgid "View information about this version of Ansible {{BRAND_NAME}}."
-msgstr ""
-
-#: client/src/inventories-hosts/inventories/inventory.list.js:106
+#: client/src/inventories-hosts/inventories/inventory.list.js:121
 msgid "View inventory"
 msgstr ""
 
-#: client/src/inventory-scripts/inventory-scripts.list.js:64
+#: client/src/inventory-scripts/inventory-scripts.list.js:72
 msgid "View inventory script"
 msgstr ""
 
-#: client/src/setup-menu/setup-menu.partial.html:55
-msgid "View list and capacity of {{BRAND_NAME}} instances."
-msgstr ""
-
-#: client/src/notifications/notificationTemplates.list.js:84
+#: client/src/notifications/notificationTemplates.list.js:93
 msgid "View notification"
 msgstr ""
 
-#: client/src/job-results/job-results.partial.html:222
-msgid "View project sync results"
-msgstr ""
-
-#: client/src/scheduler/schedules.list.js:85
+#: client/src/scheduler/schedules.list.js:93
 msgid "View schedule"
 msgstr ""
 
@@ -5136,20 +5230,40 @@ msgstr ""
 msgid "View team"
 msgstr ""
 
-#: client/src/templates/templates.list.js:114
+#: client/src/templates/templates.list.js:110
 msgid "View template"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:192
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:274
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:246
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:260
 msgid "View the"
 msgstr ""
 
-#: client/src/jobs/all-jobs.list.js:92
-msgid "View the job"
+#: client/features/output/jobs.strings.js:20
+msgid "View the Credential"
 msgstr ""
 
-#: client/src/projects/projects.list.js:111
+#: client/features/output/jobs.strings.js:19
+msgid "View the Inventory"
+msgstr ""
+
+#: client/features/output/jobs.strings.js:21
+msgid "View the Job Template"
+msgstr ""
+
+#: client/features/output/jobs.strings.js:23
+msgid "View the Project"
+msgstr ""
+
+#: client/features/output/jobs.strings.js:18
+msgid "View the Schedule"
+msgstr ""
+
+#: client/features/output/jobs.strings.js:17
+msgid "View the User"
+msgstr ""
+
+#: client/src/projects/projects.list.js:118
 msgid "View the project"
 msgstr ""
 
@@ -5157,26 +5271,25 @@ msgstr ""
 msgid "View the schedule"
 msgstr ""
 
+#: client/features/output/jobs.strings.js:22
+msgid "View the source Workflow Job"
+msgstr ""
+
 #: client/src/users/users.list.js:73
 msgid "View user"
 msgstr ""
 
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs.list.js:42
-#: client/src/instance-groups/jobs/jobs.list.js:41
-#: client/src/job-results/job-results.partial.html:145
-#: client/src/jobs/all-jobs.list.js:49
-#: client/src/standard-out/inventory-sync/standard-out-inventory-sync.partial.html:25
-#: client/src/standard-out/scm-update/standard-out-scm-update.partial.html:25
-msgid "View workflow results"
+#: client/lib/components/components.strings.js:80
+msgid "Views"
 msgstr ""
 
 #: client/src/templates/workflows.form.js:20
 msgid "WORKFLOW"
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:73
-#: client/src/configuration/configuration.controller.js:200
-#: client/src/configuration/configuration.controller.js:262
+#: client/src/configuration/auth-form/configuration-auth.controller.js:91
+#: client/src/configuration/configuration.controller.js:229
+#: client/src/configuration/configuration.controller.js:309
 #: client/src/configuration/system-form/configuration-system.controller.js:55
 msgid "Warning: Unsaved Changes"
 msgstr ""
@@ -5197,15 +5310,20 @@ msgstr ""
 msgid "When not checked, local child hosts and groups not found on the external source will remain untouched by the inventory update process."
 msgstr ""
 
-#: client/src/templates/workflows/workflow-maker/workflow-maker.form.js:97
-msgid "When this template is submitted as a job, setting the type to %s will execute the playbook, running tasks  on the selected hosts."
-msgstr ""
-
-#: client/src/shared/form-generator.js:1723
-#: client/src/templates/workflows.form.js:187
+#: client/src/shared/form-generator.js:1732
+#: client/src/templates/workflows.form.js:213
 msgid "Workflow Editor"
 msgstr ""
 
+#: client/features/jobs/jobs.strings.js:10
+msgid "Workflow Job"
+msgstr ""
+
+#: client/lib/models/models.strings.js:45
+msgid "Workflow Job Template Nodes"
+msgstr ""
+
+#: client/features/templates/templates.strings.js:14
 #: client/src/templates/templates.list.js:66
 msgid "Workflow Template"
 msgstr ""
@@ -5215,6 +5333,12 @@ msgstr ""
 msgid "Workflow Templates"
 msgstr ""
 
+#: client/features/users/tokens/tokens.strings.js:31
+msgid "Write"
+msgstr ""
+
+#: client/lib/components/code-mirror/code-mirror.strings.js:11
+#: client/lib/services/base-string.service.js:68
 #: client/src/job-submission/job-submission.partial.html:171
 msgid "YAML"
 msgstr ""
@@ -5225,6 +5349,10 @@ msgstr ""
 msgid "YAML:"
 msgstr ""
 
+#: client/lib/services/base-string.service.js:72
+msgid "YES"
+msgstr ""
+
 #: client/src/notifications/add/add.controller.js:78
 #: client/src/notifications/edit/edit.controller.js:125
 msgid "Yellow"
@@ -5234,11 +5362,15 @@ msgstr ""
 msgid "You can create a job template <a href=\"#/templates/add_job_template\">here</a>."
 msgstr ""
 
-#: client/src/projects/edit/projects-edit.controller.js:62
+#: client/features/templates/templates.strings.js:92
+msgid "You do not have access to all resources used by this workflow. Resources that you don't have access to will not be copied and will result in an incomplete workflow."
+msgstr ""
+
+#: client/src/projects/edit/projects-edit.controller.js:63
 msgid "You do not have access to view this property"
 msgstr ""
 
-#: client/src/projects/add/projects-add.controller.js:29
+#: client/src/projects/add/projects-add.controller.js:31
 msgid "You do not have permission to add a project."
 msgstr ""
 
@@ -5246,18 +5378,22 @@ msgstr ""
 msgid "You do not have permission to add a user."
 msgstr ""
 
+#: client/features/templates/templates.strings.js:67
+msgid "You do not have permission to perform this action."
+msgstr ""
+
 #: client/src/inventories-hosts/inventory-hosts.strings.js:28
 msgid "You do not have sufficient permissions to edit the host filter."
 msgstr ""
 
-#: client/src/configuration/auth-form/configuration-auth.controller.js:72
-#: client/src/configuration/configuration.controller.js:199
-#: client/src/configuration/configuration.controller.js:261
+#: client/src/configuration/auth-form/configuration-auth.controller.js:90
+#: client/src/configuration/configuration.controller.js:228
+#: client/src/configuration/configuration.controller.js:308
 #: client/src/configuration/system-form/configuration-system.controller.js:54
 msgid "You have unsaved changes. Would you like to proceed <strong>without</strong> saving?"
 msgstr ""
 
-#: client/src/projects/list/projects-list.controller.js:222
+#: client/src/projects/list/projects-list.controller.js:257
 msgid "Your request to cancel the update was submitted to the task manager."
 msgstr ""
 
@@ -5267,13 +5403,21 @@ msgstr ""
 
 #: client/src/inventories-hosts/inventories/related/groups/list/groups-list.partial.html:24
 #: client/src/job-submission/job-submission.partial.html:317
-#: client/src/shared/form-generator.js:1193
+#: client/src/shared/form-generator.js:1202
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:42
 msgid "and"
 msgstr ""
 
+#: client/features/users/tokens/tokens.strings.js:27
+msgid "by"
+msgstr ""
+
 #: client/src/job-submission/job-submission.partial.html:289
 #: client/src/job-submission/job-submission.partial.html:294
 #: client/src/job-submission/job-submission.partial.html:305
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:14
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:19
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:30
 msgid "characters long."
 msgstr ""
 
@@ -5281,8 +5425,8 @@ msgstr ""
 msgid "documentation"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:193
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:275
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:247
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:261
 msgid "for a complete list of supported filters."
 msgstr ""
 
@@ -5316,7 +5460,7 @@ msgstr[1] ""
 msgid "hosts"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:58
+#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:60
 msgid "hosts with failures. Click for details."
 msgstr ""
 
@@ -5328,8 +5472,8 @@ msgstr ""
 msgid "of"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:185
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:267
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:239
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:253
 msgid "of the filters match."
 msgstr ""
 
@@ -5337,7 +5481,7 @@ msgstr ""
 msgid "organization"
 msgstr ""
 
-#: client/src/shared/form-generator.js:1069
+#: client/src/shared/form-generator.js:1078
 msgid "playbook"
 msgstr ""
 
@@ -5346,18 +5490,21 @@ msgstr ""
 msgid "set in helpers/credentials"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:43
+#: client/src/inventories-hosts/inventories/list/inventory-list.controller.js:45
 msgid "sources with sync failures. Click for details"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:190
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:272
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:244
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:258
 msgid "test"
 msgstr ""
 
 #: client/src/job-submission/job-submission.partial.html:289
 #: client/src/job-submission/job-submission.partial.html:294
 #: client/src/job-submission/job-submission.partial.html:305
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:14
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:19
+#: client/src/templates/prompt/steps/survey/prompt-survey.partial.html:30
 msgid "to"
 msgstr ""
 
@@ -5393,13 +5540,13 @@ msgstr ""
 msgid "view vmware_inventory.ini in the Ansible github repo."
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:185
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:267
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:239
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:253
 msgid "when"
 msgstr ""
 
-#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:171
-#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:252
+#: client/src/inventories-hosts/inventories/related/sources/add/sources-add.controller.js:225
+#: client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js:238
 msgid "will create group names similar to the following examples based on the options selected:"
 msgstr ""
 
@@ -5407,22 +5554,33 @@ msgstr ""
 msgid "with failed jobs."
 msgstr ""
 
-#: client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js:9
-msgid "{{ breadcrumb.instance_name }}"
+#: client/lib/services/base-string.service.js:93
+msgid "{{ header }} {{ body }}"
+msgstr ""
+
+#: client/features/output/details.partial.html:283
+#: client/features/output/details.partial.html:290
+msgid "{{ vm.jobTags.label }}"
+msgstr ""
+
+#: client/features/output/details.partial.html:258
+#: client/features/output/details.partial.html:265
+msgid "{{ vm.labels.label }}"
+msgstr ""
+
+#: client/features/output/details.partial.html:308
+#: client/features/output/details.partial.html:315
+msgid "{{ vm.skipTags.label }}"
+msgstr ""
+
+#: client/src/templates/prompt/steps/other-prompts/prompt-other-prompts.partial.html:5
+msgid "{{:: vm.strings.get('prompt.JOB_TYPE') }}"
 msgstr ""
 
 #: client/lib/components/input/label.partial.html:5
 msgid "{{::state._hint}}"
 msgstr ""
 
-#: client/src/instance-groups/instances/instances-list.route.js:10
-msgid "{{breadcrumb.instance_group_name}}"
-msgstr ""
-
 #: client/src/shared/paginate/paginate.partial.html:55
 msgid "{{pageSize}}"
 msgstr ""
-
-#: client/src/notifications/notificationTemplates.form.js:445
-msgid "Specify a notification color. Acceptable colors are hex color code (example: #3af or #789abc) ."
-msgstr ""

From 33d4c97156d85a0a11fdaa9edbbdf4632aa06e0b Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Wed, 2 May 2018 16:59:14 -0700
Subject: [PATCH 086/169] Sets the timezone to the api/v2/schedule/:id ->
 data.timezone

and moving the data calls from the controller to the route resolve
---
 .../src/management-jobs/scheduler/main.js     |   5 +-
 .../src/scheduler/editSchedule.resolve.js     |  39 ++
 awx/ui/client/src/scheduler/main.js           |  10 +-
 .../src/scheduler/schedulerEdit.controller.js | 631 +++++++++---------
 4 files changed, 363 insertions(+), 322 deletions(-)
 create mode 100644 awx/ui/client/src/scheduler/editSchedule.resolve.js

diff --git a/awx/ui/client/src/management-jobs/scheduler/main.js b/awx/ui/client/src/management-jobs/scheduler/main.js
index 4c1cb50ce5..0fff48415f 100644
--- a/awx/ui/client/src/management-jobs/scheduler/main.js
+++ b/awx/ui/client/src/management-jobs/scheduler/main.js
@@ -10,6 +10,8 @@ import controller from '../../scheduler/schedulerList.controller';
 import addController from '../../scheduler/schedulerAdd.controller';
 import editController from '../../scheduler/schedulerEdit.controller';
 import { N_ } from '../../i18n';
+import editScheduleResolve from '../../scheduler/editSchedule.resolve';
+
 
 export default
 angular.module('managementJobScheduler', [])
@@ -99,6 +101,7 @@ angular.module('managementJobScheduler', [])
                     templateUrl: templateUrl('management-jobs/scheduler/schedulerForm'),
                     controller: 'managementJobEditController'
                 }
-            }
+            },
+            resolve: editScheduleResolve()
         });
     }]);
diff --git a/awx/ui/client/src/scheduler/editSchedule.resolve.js b/awx/ui/client/src/scheduler/editSchedule.resolve.js
new file mode 100644
index 0000000000..8c20f833b6
--- /dev/null
+++ b/awx/ui/client/src/scheduler/editSchedule.resolve.js
@@ -0,0 +1,39 @@
+function editScheduleResolve () {
+    const resolve = {
+        scheduleResolve: ['Rest', '$stateParams', 'GetBasePath', 'ProcessErrors',
+            (Rest, $stateParams, GetBasePath, ProcessErrors) => {
+                var path = `${GetBasePath('schedules')}${parseInt($stateParams.schedule_id)}/`;
+                // const path = GetBasePath('schedules') + parseInt($stateParams.schedule_id) + '/');
+                Rest.setUrl(path);
+                return Rest.get()
+                    .then(function(data) {
+                        return (data.data);
+                    }).catch(function(response) {
+                        ProcessErrors(null, response.data, response.status, null, {
+                            hdr: 'Error!',
+                            msg: 'Failed to get schedule info. GET returned status: ' +
+                                response.status
+                        });
+                    });
+            }
+        ],
+        timezonesResolve: ['Rest', '$stateParams', 'GetBasePath', 'ProcessErrors',
+            (Rest, $stateParams, GetBasePath, ProcessErrors) => {
+                var path = `${GetBasePath('schedules')}/zoneinfo`;
+                Rest.setUrl(path);
+                return Rest.get()
+                    .then(function(data) {
+                        return (data.data);
+                    }).catch(function(response) {
+                        ProcessErrors(null, response.data, response.status, null, {
+                            hdr: 'Error!',
+                            msg: 'Failed to get zoneinfo. GET returned status: ' +
+                                response.status
+                        });
+                    });
+            }
+        ]
+    };
+    return resolve;
+}
+export default editScheduleResolve;
diff --git a/awx/ui/client/src/scheduler/main.js b/awx/ui/client/src/scheduler/main.js
index 93357de409..b20b77b349 100644
--- a/awx/ui/client/src/scheduler/main.js
+++ b/awx/ui/client/src/scheduler/main.js
@@ -16,6 +16,7 @@ import SchedulePost from './factories/schedule-post.factory';
 import ToggleSchedule from './factories/toggle-schedule.factory';
 import SchedulesList from './schedules.list';
 import ScheduledJobsList from './scheduled-jobs.list';
+import editScheduleResolve from './editSchedule.resolve';
 
 export default
     angular.module('scheduler', [])
@@ -121,7 +122,8 @@ export default
                 ncyBreadcrumb: {
                     parent: 'jobTemplateSchedules',
                     label: '{{schedule_obj.name}}'
-                }
+                },
+                resolve: editScheduleResolve()
             });
 
             // workflows
@@ -212,7 +214,8 @@ export default
                 ncyBreadcrumb: {
                     parent: 'workflowJobTemplateSchedules',
                     label: '{{schedule_obj.name}}'
-                }
+                },
+                resolve: editScheduleResolve()
             });
             // projects
             $stateExtender.addState({
@@ -301,7 +304,8 @@ export default
                         controller: 'schedulerEditController',
                         templateUrl: templateUrl("scheduler/schedulerForm"),
                     }
-                }
+                },
+                resolve: editScheduleResolve()
             });
             // upcoming scheduled jobs
             $stateExtender.addState({
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index 339b46740c..f421c61a8e 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -1,11 +1,11 @@
 export default ['$filter', '$state', '$stateParams', 'Wait', '$scope', 'moment',
 '$rootScope', '$http', 'CreateSelect2', 'ParseTypeChange', 'ParentObject', 'ProcessErrors', 'Rest',
 'GetBasePath', 'SchedulerInit', 'SchedulePost', 'JobTemplateModel', '$q', 'Empty', 'PromptService', 'RRuleToAPI',
-'WorkflowJobTemplateModel', 'TemplatesStrings',
+'WorkflowJobTemplateModel', 'TemplatesStrings', 'scheduleResolve', 'timezonesResolve',
 function($filter, $state, $stateParams, Wait, $scope, moment,
     $rootScope, $http, CreateSelect2, ParseTypeChange, ParentObject, ProcessErrors, Rest,
     GetBasePath, SchedulerInit, SchedulePost, JobTemplate, $q, Empty, PromptService, RRuleToAPI,
-    WorkflowJobTemplate, TemplatesStrings
+    WorkflowJobTemplate, TemplatesStrings, scheduleResolve, timezonesResolve
 ) {
 
     let schedule, scheduler, scheduleCredentials = [];
@@ -118,337 +118,332 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
 
     Wait('start');
 
-    // Get the existing record
-    Rest.setUrl(GetBasePath('schedules') + parseInt($stateParams.schedule_id) + '/');
-    Rest.get()
-        .then(({data}) => {
-            schedule = data;
-            try {
-                schedule.extra_data = JSON.parse(schedule.extra_data);
-            } catch(e) {
-                // do nothing
-            }
+    //sets the timezone dropdown to the timezone specified by the API
+    function setTimezone () {
+        $scope.schedulerTimeZone = _.find($scope.timeZones, function(x) {
+            return x.name === scheduleResolve.timezone;
+        });
+    }
 
-            $scope.extraVars = (data.extra_data === '' || _.isEmpty(data.extra_data)) ? '---' : '---\n' + jsyaml.safeDump(data.extra_data);
+    function init() {
+        schedule = scheduleResolve;
 
-            if (_.has(schedule, 'summary_fields.unified_job_template.unified_job_type') &&
-                schedule.summary_fields.unified_job_template.unified_job_type === 'system_job'){
-                $scope.cleanupJob = true;
-            }
+        try {
+            schedule.extra_data = JSON.parse(schedule.extra_data);
+        } catch(e) {
+            // do nothing
+        }
 
-            $scope.schedule_obj = data;
+        $scope.extraVars = (scheduleResolve.extra_data === '' || _.isEmpty(scheduleResolve.extra_data)) ? '---' : '---\n' + jsyaml.safeDump(scheduleResolve.extra_data);
 
-            $('#form-container').empty();
-            scheduler = SchedulerInit({ scope: $scope, requireFutureStartTime: false });
+        if (_.has(schedule, 'summary_fields.unified_job_template.unified_job_type') &&
+            schedule.summary_fields.unified_job_template.unified_job_type === 'system_job'){
+            $scope.cleanupJob = true;
+        }
 
-            $http.get('/api/v2/schedules/zoneinfo/').then(({data}) => {
-                scheduler.scope.timeZones = data;
-                scheduler.scope.schedulerTimeZone = _.find(data, function(x) {
-                    let tz = $scope.schedule_obj.rrule.match(/TZID=\s*(.*?)\s*:/);
-                    if (_.has(tz, '1')) {
-                        return x.name === tz[1];
-                    } else {
-                        return false;
-                    }
+        $scope.schedule_obj = scheduleResolve;
 
-                });
-            });
-            scheduler.inject('form-container', false);
-            scheduler.injectDetail('occurrences', false);
+        $('#form-container').empty();
+        scheduler = SchedulerInit({ scope: $scope, requireFutureStartTime: false });
 
-            if (!/DTSTART/.test(schedule.rrule)) {
-                schedule.rrule += ";DTSTART=" + schedule.dtstart.replace(/\.\d+Z$/,'Z');
-            }
-            schedule.rrule = schedule.rrule.replace(/ RRULE:/,';');
-            schedule.rrule = schedule.rrule.replace(/DTSTART:/,'DTSTART=');
-            $scope.$on("htmlDetailReady", function() {
-                scheduler.setRRule(schedule.rrule);
-                scheduler.setName(schedule.name);
-                $scope.hideForm = false;
+        scheduler.scope.timeZones = timezonesResolve;
+        setTimezone();
 
-                $scope.$watchGroup(["schedulerName",
-                    "schedulerStartDt",
-                    "schedulerStartHour",
-                    "schedulerStartMinute",
-                    "schedulerStartSecond",
-                    "schedulerTimeZone",
-                    "schedulerFrequency",
-                    "schedulerInterval",
-                    "monthlyRepeatOption",
-                    "monthDay",
-                    "monthlyOccurrence",
-                    "monthlyWeekDay",
-                    "yearlyRepeatOption",
-                    "yearlyMonth",
-                    "yearlyMonthDay",
-                    "yearlyOccurrence",
-                    "yearlyWeekDay",
-                    "yearlyOtherMonth",
-                    "schedulerEnd",
-                    "schedulerOccurrenceCount",
-                    "schedulerEndDt"
-                ], function() {
-                    $rootScope.$broadcast("loadSchedulerDetailPane");
-                }, true);
+        scheduler.inject('form-container', false);
+        scheduler.injectDetail('occurrences', false);
 
-                $scope.$watch("weekDays", function() {
-                    $rootScope.$broadcast("loadSchedulerDetailPane");
-                }, true);
-
-                $rootScope.$broadcast("loadSchedulerDetailPane");
-                Wait('stop');
-            });
-
-            $scope.showRRuleDetail = false;
+        if (!/DTSTART/.test(schedule.rrule)) {
+            schedule.rrule += ";DTSTART=" + schedule.dtstart.replace(/\.\d+Z$/,'Z');
+        }
+        schedule.rrule = schedule.rrule.replace(/ RRULE:/,';');
+        schedule.rrule = schedule.rrule.replace(/DTSTART:/,'DTSTART=');
+        $scope.$on("htmlDetailReady", function() {
             scheduler.setRRule(schedule.rrule);
             scheduler.setName(schedule.name);
+            setTimezone();
+            $scope.hideForm = false;
 
-            if ($scope.cleanupJob){
-                $scope.schedulerPurgeDays = Number(schedule.extra_data.days);
-            }
+            $scope.$watchGroup(["schedulerName",
+                "schedulerStartDt",
+                "schedulerStartHour",
+                "schedulerStartMinute",
+                "schedulerStartSecond",
+                "schedulerTimeZone",
+                "schedulerFrequency",
+                "schedulerInterval",
+                "monthlyRepeatOption",
+                "monthDay",
+                "monthlyOccurrence",
+                "monthlyWeekDay",
+                "yearlyRepeatOption",
+                "yearlyMonth",
+                "yearlyMonthDay",
+                "yearlyOccurrence",
+                "yearlyWeekDay",
+                "yearlyOtherMonth",
+                "schedulerEnd",
+                "schedulerOccurrenceCount",
+                "schedulerEndDt"
+            ], function() {
+                $rootScope.$broadcast("loadSchedulerDetailPane");
+            }, true);
 
-            if ($state.current.name === 'jobTemplateSchedules.edit'){
+            $scope.$watch("weekDays", function() {
+                $rootScope.$broadcast("loadSchedulerDetailPane");
+            }, true);
 
-                let jobTemplate = new JobTemplate();
-
-                Rest.setUrl(data.related.credentials);
-
-                $q.all([jobTemplate.optionsLaunch(ParentObject.id), jobTemplate.getLaunch(ParentObject.id), Rest.get()])
-                    .then((responses) => {
-                        let launchOptions = responses[0].data,
-                            launchConf = responses[1].data;
-
-                        scheduleCredentials = responses[2].data.results;
-
-                        let watchForPromptChanges = () => {
-                            let promptValuesToWatch = [
-                                'promptData.prompts.inventory.value',
-                                'promptData.prompts.jobType.value',
-                                'promptData.prompts.verbosity.value',
-                                'missingSurveyValue'
-                            ];
-
-                            $scope.$watchGroup(promptValuesToWatch, function() {
-                                let missingPromptValue = false;
-                                if ($scope.missingSurveyValue) {
-                                    missingPromptValue = true;
-                                } else if (!$scope.promptData.prompts.inventory.value || !$scope.promptData.prompts.inventory.value.id) {
-                                    missingPromptValue = true;
-                                }
-                                $scope.promptModalMissingReqFields = missingPromptValue;
-                            });
-                        };
-
-                        let prompts = PromptService.processPromptValues({
-                            launchConf: responses[1].data,
-                            launchOptions: responses[0].data,
-                            currentValues: data
-                        });
-
-                        let defaultCredsWithoutOverrides = [];
-
-                        const credentialHasScheduleOverride = (templateDefaultCred) => {
-                            let credentialHasOverride = false;
-                            scheduleCredentials.forEach((scheduleCred) => {
-                                if (templateDefaultCred.credential_type === scheduleCred.credential_type) {
-                                    if (
-                                        (!templateDefaultCred.vault_id && !scheduleCred.inputs.vault_id) ||
-                                        (templateDefaultCred.vault_id && scheduleCred.inputs.vault_id && templateDefaultCred.vault_id === scheduleCred.inputs.vault_id)
-                                    ) {
-                                        credentialHasOverride = true;
-                                    }
-                                }
-                            });
-
-                            return credentialHasOverride;
-                        };
-
-                        if (_.has(launchConf, 'defaults.credentials')) {
-                            launchConf.defaults.credentials.forEach((defaultCred) => {
-                                if (!credentialHasScheduleOverride(defaultCred)) {
-                                    defaultCredsWithoutOverrides.push(defaultCred);
-                                }
-                            });
-                        }
-
-                        prompts.credentials.value = defaultCredsWithoutOverrides.concat(scheduleCredentials);
-
-                        if (!launchConf.ask_variables_on_launch) {
-                            $scope.noVars = true;
-                        }
-
-                        if (!launchConf.survey_enabled &&
-                            !launchConf.ask_inventory_on_launch &&
-                            !launchConf.ask_credential_on_launch &&
-                            !launchConf.ask_verbosity_on_launch &&
-                            !launchConf.ask_job_type_on_launch &&
-                            !launchConf.ask_limit_on_launch &&
-                            !launchConf.ask_tags_on_launch &&
-                            !launchConf.ask_skip_tags_on_launch &&
-                            !launchConf.ask_diff_mode_on_launch &&
-                            !launchConf.survey_enabled &&
-                            !launchConf.credential_needed_to_start &&
-                            !launchConf.inventory_needed_to_start &&
-                            launchConf.passwords_needed_to_start.length === 0 &&
-                            launchConf.variables_needed_to_start.length === 0) {
-                                $scope.showPromptButton = false;
-                        } else {
-                            $scope.showPromptButton = true;
-
-                            // Ignore the fact that variables might be promptable on launch
-                            // Promptable variables will happen in the schedule form
-                            launchConf.ignore_ask_variables = true;
-
-                            if (launchConf.ask_inventory_on_launch && !_.has(launchConf, 'defaults.inventory') && !_.has(data, 'summary_fields.inventory')) {
-                                $scope.promptModalMissingReqFields = true;
-                            }
-
-                            if (responses[1].data.survey_enabled) {
-                                // go out and get the survey questions
-                                jobTemplate.getSurveyQuestions(ParentObject.id)
-                                    .then((surveyQuestionRes) => {
-
-                                        let processed = PromptService.processSurveyQuestions({
-                                            surveyQuestions: surveyQuestionRes.data.spec,
-                                            extra_data: _.cloneDeep(data.extra_data)
-                                        });
-
-                                        $scope.missingSurveyValue = processed.missingSurveyValue;
-
-                                        $scope.extraVars = (processed.extra_data === '' || _.isEmpty(processed.extra_data)) ? '---' : '---\n' + jsyaml.safeDump(processed.extra_data);
-
-                                        ParseTypeChange({
-                                            scope: $scope,
-                                            variable: 'extraVars',
-                                            parse_variable: 'parseType',
-                                            field_id: 'SchedulerForm-extraVars',
-                                            readOnly: !$scope.schedule_obj.summary_fields.user_capabilities.edit
-                                        });
-
-                                        $scope.promptData = {
-                                            launchConf: launchConf,
-                                            launchOptions: launchOptions,
-                                            prompts: prompts,
-                                            surveyQuestions: surveyQuestionRes.data.spec,
-                                            template: ParentObject.id
-                                        };
-
-                                        $scope.$watch('promptData.surveyQuestions', () => {
-                                            let missingSurveyValue = false;
-                                            _.each($scope.promptData.surveyQuestions, (question) => {
-                                                if (question.required && (Empty(question.model) || question.model === [])) {
-                                                    missingSurveyValue = true;
-                                                }
-                                            });
-                                            $scope.missingSurveyValue = missingSurveyValue;
-                                        }, true);
-
-                                        watchForPromptChanges();
-                                    });
-                            } else {
-                                $scope.promptData = {
-                                    launchConf: launchConf,
-                                    launchOptions: launchOptions,
-                                    prompts: prompts,
-                                    template: ParentObject.id
-                                };
-                                watchForPromptChanges();
-                            }
-                        }
-                    });
-            } else if ($state.current.name === 'workflowJobTemplateSchedules.edit') {
-                let workflowJobTemplate = new WorkflowJobTemplate();
-
-                $q.all([workflowJobTemplate.optionsLaunch(ParentObject.id), workflowJobTemplate.getLaunch(ParentObject.id)])
-                    .then((responses) => {
-                        let launchOptions = responses[0].data,
-                            launchConf = responses[1].data;
-
-                        let watchForPromptChanges = () => {
-                            $scope.$watch('missingSurveyValue', function() {
-                                $scope.promptModalMissingReqFields = $scope.missingSurveyValue ? true : false;
-                            });
-                        };
-
-                        let prompts = PromptService.processPromptValues({
-                            launchConf: responses[1].data,
-                            launchOptions: responses[0].data,
-                            currentValues: data
-                        });
-
-                        if(!launchConf.survey_enabled) {
-                            $scope.showPromptButton = false;
-                        } else {
-                            $scope.showPromptButton = true;
-
-                            if(responses[1].data.survey_enabled) {
-                                // go out and get the survey questions
-                                workflowJobTemplate.getSurveyQuestions(ParentObject.id)
-                                    .then((surveyQuestionRes) => {
-
-                                        let processed = PromptService.processSurveyQuestions({
-                                            surveyQuestions: surveyQuestionRes.data.spec,
-                                            extra_data: _.cloneDeep(data.extra_data)
-                                        });
-
-                                        $scope.missingSurveyValue = processed.missingSurveyValue;
-
-                                        $scope.promptData = {
-                                            launchConf: launchConf,
-                                            launchOptions: launchOptions,
-                                            prompts: prompts,
-                                            surveyQuestions: surveyQuestionRes.data.spec,
-                                            template: ParentObject.id
-                                        };
-
-                                        $scope.$watch('promptData.surveyQuestions', () => {
-                                            let missingSurveyValue = false;
-                                            _.each($scope.promptData.surveyQuestions, (question) => {
-                                                if(question.required && (Empty(question.model) || question.model === [])) {
-                                                    missingSurveyValue = true;
-                                                }
-                                            });
-                                            $scope.missingSurveyValue = missingSurveyValue;
-                                        }, true);
-
-                                        watchForPromptChanges();
-                                    });
-                            }
-                            else {
-                                $scope.promptData = {
-                                    launchConf: launchConf,
-                                    launchOptions: launchOptions,
-                                    prompts: prompts,
-                                    template: ParentObject.id
-                                };
-                                watchForPromptChanges();
-                            }
-                        }
-                    });
-            }
-
-            // extra_data field is not manifested in the UI when scheduling a Management Job
-            if ($state.current.name !== 'managementJobsList.schedule.add' && $state.current.name !== 'managementJobsList.schedule.edit'){
-                if ($state.current.name === 'projectSchedules.edit' ||
-                    $state.current.name === 'inventories.edit.inventory_sources.edit.schedules.edit' ||
-                    $state.current.name === 'workflowJobTemplateSchedules.add'
-                ){
-                    $scope.noVars = true;
-                } else {
-                    ParseTypeChange({
-                        scope: $scope,
-                        variable: 'extraVars',
-                        parse_variable: 'parseType',
-                        field_id: 'SchedulerForm-extraVars',
-                        readOnly: !$scope.schedule_obj.summary_fields.user_capabilities.edit
-                    });
-                }
-            }
-        })
-        .catch(({data, status}) => {
-            ProcessErrors($scope, data, status, null, { hdr: 'Error!',
-                msg: 'Failed to retrieve schedule ' + parseInt($stateParams.schedule_id) + ' GET returned: ' + status });
+            $rootScope.$broadcast("loadSchedulerDetailPane");
+            Wait('stop');
         });
 
+        $scope.showRRuleDetail = false;
+        scheduler.setRRule(schedule.rrule);
+        scheduler.setName(schedule.name);
+        scheduler.scope.timeZones = timezonesResolve;
+        scheduler.scope.schedulerTimeZone = scheduleResolve.timezone;
+        if ($scope.cleanupJob){
+            $scope.schedulerPurgeDays = Number(schedule.extra_data.days);
+        }
+
+        if ($state.current.name === 'jobTemplateSchedules.edit'){
+
+            let jobTemplate = new JobTemplate();
+
+            Rest.setUrl(scheduleResolve.related.credentials);
+
+            $q.all([jobTemplate.optionsLaunch(ParentObject.id), jobTemplate.getLaunch(ParentObject.id), Rest.get()])
+                .then((responses) => {
+                    let launchOptions = responses[0].data,
+                        launchConf = responses[1].data;
+
+                    scheduleCredentials = responses[2].data.results;
+
+                    let watchForPromptChanges = () => {
+                        let promptValuesToWatch = [
+                            'promptData.prompts.inventory.value',
+                            'promptData.prompts.jobType.value',
+                            'promptData.prompts.verbosity.value',
+                            'missingSurveyValue'
+                        ];
+
+                        $scope.$watchGroup(promptValuesToWatch, function() {
+                            let missingPromptValue = false;
+                            if ($scope.missingSurveyValue) {
+                                missingPromptValue = true;
+                            } else if (!$scope.promptData.prompts.inventory.value || !$scope.promptData.prompts.inventory.value.id) {
+                                missingPromptValue = true;
+                            }
+                            $scope.promptModalMissingReqFields = missingPromptValue;
+                        });
+                    };
+
+                    let prompts = PromptService.processPromptValues({
+                        launchConf: responses[1].data,
+                        launchOptions: responses[0].data,
+                        currentValues: scheduleResolve
+                    });
+
+                    let defaultCredsWithoutOverrides = [];
+
+                    const credentialHasScheduleOverride = (templateDefaultCred) => {
+                        let credentialHasOverride = false;
+                        scheduleCredentials.forEach((scheduleCred) => {
+                            if (templateDefaultCred.credential_type === scheduleCred.credential_type) {
+                                if (
+                                    (!templateDefaultCred.vault_id && !scheduleCred.inputs.vault_id) ||
+                                    (templateDefaultCred.vault_id && scheduleCred.inputs.vault_id && templateDefaultCred.vault_id === scheduleCred.inputs.vault_id)
+                                ) {
+                                    credentialHasOverride = true;
+                                }
+                            }
+                        });
+
+                        return credentialHasOverride;
+                    };
+
+                    if (_.has(launchConf, 'defaults.credentials')) {
+                        launchConf.defaults.credentials.forEach((defaultCred) => {
+                            if (!credentialHasScheduleOverride(defaultCred)) {
+                                defaultCredsWithoutOverrides.push(defaultCred);
+                            }
+                        });
+                    }
+
+                    prompts.credentials.value = defaultCredsWithoutOverrides.concat(scheduleCredentials);
+
+                    if (!launchConf.ask_variables_on_launch) {
+                        $scope.noVars = true;
+                    }
+
+                    if (!launchConf.survey_enabled &&
+                        !launchConf.ask_inventory_on_launch &&
+                        !launchConf.ask_credential_on_launch &&
+                        !launchConf.ask_verbosity_on_launch &&
+                        !launchConf.ask_job_type_on_launch &&
+                        !launchConf.ask_limit_on_launch &&
+                        !launchConf.ask_tags_on_launch &&
+                        !launchConf.ask_skip_tags_on_launch &&
+                        !launchConf.ask_diff_mode_on_launch &&
+                        !launchConf.survey_enabled &&
+                        !launchConf.credential_needed_to_start &&
+                        !launchConf.inventory_needed_to_start &&
+                        launchConf.passwords_needed_to_start.length === 0 &&
+                        launchConf.variables_needed_to_start.length === 0) {
+                            $scope.showPromptButton = false;
+                    } else {
+                        $scope.showPromptButton = true;
+
+                        // Ignore the fact that variables might be promptable on launch
+                        // Promptable variables will happen in the schedule form
+                        launchConf.ignore_ask_variables = true;
+
+                        if (launchConf.ask_inventory_on_launch && !_.has(launchConf, 'defaults.inventory') && !_.has(scheduleResolve, 'summary_fields.inventory')) {
+                            $scope.promptModalMissingReqFields = true;
+                        }
+
+                        if (responses[1].data.survey_enabled) {
+                            // go out and get the survey questions
+                            jobTemplate.getSurveyQuestions(ParentObject.id)
+                                .then((surveyQuestionRes) => {
+
+                                    let processed = PromptService.processSurveyQuestions({
+                                        surveyQuestions: surveyQuestionRes.data.spec,
+                                        extra_data: _.cloneDeep(scheduleResolve.extra_data)
+                                    });
+
+                                    $scope.missingSurveyValue = processed.missingSurveyValue;
+
+                                    $scope.extraVars = (processed.extra_data === '' || _.isEmpty(processed.extra_data)) ? '---' : '---\n' + jsyaml.safeDump(processed.extra_data);
+
+                                    ParseTypeChange({
+                                        scope: $scope,
+                                        variable: 'extraVars',
+                                        parse_variable: 'parseType',
+                                        field_id: 'SchedulerForm-extraVars',
+                                        readOnly: !$scope.schedule_obj.summary_fields.user_capabilities.edit
+                                    });
+
+                                    $scope.promptData = {
+                                        launchConf: launchConf,
+                                        launchOptions: launchOptions,
+                                        prompts: prompts,
+                                        surveyQuestions: surveyQuestionRes.data.spec,
+                                        template: ParentObject.id
+                                    };
+
+                                    $scope.$watch('promptData.surveyQuestions', () => {
+                                        let missingSurveyValue = false;
+                                        _.each($scope.promptData.surveyQuestions, (question) => {
+                                            if (question.required && (Empty(question.model) || question.model === [])) {
+                                                missingSurveyValue = true;
+                                            }
+                                        });
+                                        $scope.missingSurveyValue = missingSurveyValue;
+                                    }, true);
+
+                                    watchForPromptChanges();
+                                });
+                        } else {
+                            $scope.promptData = {
+                                launchConf: launchConf,
+                                launchOptions: launchOptions,
+                                prompts: prompts,
+                                template: ParentObject.id
+                            };
+                            watchForPromptChanges();
+                        }
+                    }
+                });
+        } else if ($state.current.name === 'workflowJobTemplateSchedules.edit') {
+            let workflowJobTemplate = new WorkflowJobTemplate();
+
+            $q.all([workflowJobTemplate.optionsLaunch(ParentObject.id), workflowJobTemplate.getLaunch(ParentObject.id)])
+                .then((responses) => {
+                    let launchOptions = responses[0].data,
+                        launchConf = responses[1].data;
+
+                    let watchForPromptChanges = () => {
+                        $scope.$watch('missingSurveyValue', function() {
+                            $scope.promptModalMissingReqFields = $scope.missingSurveyValue ? true : false;
+                        });
+                    };
+
+                    let prompts = PromptService.processPromptValues({
+                        launchConf: responses[1].data,
+                        launchOptions: responses[0].data,
+                        currentValues: scheduleResolve
+                    });
+
+                    if(!launchConf.survey_enabled) {
+                        $scope.showPromptButton = false;
+                    } else {
+                        $scope.showPromptButton = true;
+
+                        if(responses[1].data.survey_enabled) {
+                            // go out and get the survey questions
+                            workflowJobTemplate.getSurveyQuestions(ParentObject.id)
+                                .then((surveyQuestionRes) => {
+
+                                    let processed = PromptService.processSurveyQuestions({
+                                        surveyQuestions: surveyQuestionRes.data.spec,
+                                        extra_data: _.cloneDeep(scheduleResolve.extra_data)
+                                    });
+
+                                    $scope.missingSurveyValue = processed.missingSurveyValue;
+
+                                    $scope.promptData = {
+                                        launchConf: launchConf,
+                                        launchOptions: launchOptions,
+                                        prompts: prompts,
+                                        surveyQuestions: surveyQuestionRes.data.spec,
+                                        template: ParentObject.id
+                                    };
+
+                                    $scope.$watch('promptData.surveyQuestions', () => {
+                                        let missingSurveyValue = false;
+                                        _.each($scope.promptData.surveyQuestions, (question) => {
+                                            if(question.required && (Empty(question.model) || question.model === [])) {
+                                                missingSurveyValue = true;
+                                            }
+                                        });
+                                        $scope.missingSurveyValue = missingSurveyValue;
+                                    }, true);
+
+                                    watchForPromptChanges();
+                                });
+                        }
+                        else {
+                            $scope.promptData = {
+                                launchConf: launchConf,
+                                launchOptions: launchOptions,
+                                prompts: prompts,
+                                template: ParentObject.id
+                            };
+                            watchForPromptChanges();
+                        }
+                    }
+                });
+        }
+
+        // extra_data field is not manifested in the UI when scheduling a Management Job
+        if ($state.current.name !== 'managementJobsList.schedule.add' && $state.current.name !== 'managementJobsList.schedule.edit'){
+            if ($state.current.name === 'projectSchedules.edit' ||
+                $state.current.name === 'inventories.edit.inventory_sources.edit.schedules.edit' ||
+                $state.current.name === 'workflowJobTemplateSchedules.add'
+            ){
+                $scope.noVars = true;
+            } else {
+                ParseTypeChange({
+                    scope: $scope,
+                    variable: 'extraVars',
+                    parse_variable: 'parseType',
+                    field_id: 'SchedulerForm-extraVars',
+                    readOnly: !$scope.schedule_obj.summary_fields.user_capabilities.edit
+                });
+            }
+        }
+    }
+    init();
+
     callSelect2();
 }];

From 876431c5294559d7305c103cd95ad44afc359a29 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Mon, 7 May 2018 14:41:22 -0700
Subject: [PATCH 087/169] Removes the 'Z' from the UNTIL before sending the
 rrule to the API

---
 .../factories/r-rule-to-api.factory.js         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/awx/ui/client/src/scheduler/factories/r-rule-to-api.factory.js b/awx/ui/client/src/scheduler/factories/r-rule-to-api.factory.js
index 7698ed9ea5..9c86205559 100644
--- a/awx/ui/client/src/scheduler/factories/r-rule-to-api.factory.js
+++ b/awx/ui/client/src/scheduler/factories/r-rule-to-api.factory.js
@@ -1,5 +1,21 @@
 export default
     function RRuleToAPI() {
+
+        // This function removes the 'Z' from the UNTIL portion of the
+        // rrule. The API will default to using the timezone that is
+        // specified in the TZID as the locale for the UNTIL. 
+        function parseOutZ (rrule) {
+            let until = rrule.split('UNTIL=');
+            if(_.has(until, '1')){
+                rrule = until[0];
+                until = until[1].replace('Z', '');
+                return `${rrule}UNTIL=${until}`;
+            } else {
+                return rrule;
+            }
+        }
+
+
         return function(rrule, scope) {
             let localTime = scope.schedulerLocalTime;
             let timeZone = scope.schedulerTimeZone.name;
@@ -7,6 +23,8 @@ export default
             let response = rrule.replace(/(^.*(?=DTSTART))(DTSTART.*?)(=.*?;)(.*$)/, (str, p1, p2, p3, p4) => {
                 return p2 + ';TZID=' + timeZone + ':' + localTime + ' ' + 'RRULE:' + p4;
             });
+
+            response = parseOutZ(response);
             return response;
         };
     }

From 00ae91dace48f5feda2979c30b42f7c084fd350a Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 8 May 2018 08:21:42 -0400
Subject: [PATCH 088/169] slight cleanup and refactor of Schedule.timezone
 property

---
 awx/api/views.py             |  6 +++++-
 awx/main/models/schedules.py | 35 +++++++++++++++--------------------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/awx/api/views.py b/awx/api/views.py
index f1098ffce0..3304c2ca43 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -745,7 +745,11 @@ class ScheduleZoneInfo(APIView):
     swagger_topic = 'System Configuration'
 
     def get(self, request):
-        return Response(Schedule.get_zoneinfo())
+        zones = [
+            {'name': zone}
+            for zone in Schedule.get_zoneinfo()
+        ]
+        return Response(zones)
 
 
 class LaunchConfigCredentialsBase(SubListAttachDetachAPIView):
diff --git a/awx/main/models/schedules.py b/awx/main/models/schedules.py
index 565ad2de12..787e69da0b 100644
--- a/awx/main/models/schedules.py
+++ b/awx/main/models/schedules.py
@@ -6,9 +6,9 @@ import logging
 import re
 
 import dateutil.rrule
-from operator import itemgetter
 import dateutil.parser
 from dateutil.tz import datetime_exists, tzutc
+from dateutil.zoneinfo import get_zonefile_instance
 
 # Django
 from django.db import models
@@ -100,28 +100,22 @@ class Schedule(CommonModel, LaunchTimeConfig):
 
     @classmethod
     def get_zoneinfo(self):
-        from dateutil.zoneinfo import get_zonefile_instance
-        return [
-            {'name': zone}
-            for zone in sorted(get_zonefile_instance().zones)
-        ]
+        return sorted(get_zonefile_instance().zones)
 
     @property
     def timezone(self):
         utc = tzutc()
-        _rrule = dateutil.rrule.rrulestr(
-            self.rrule,
-            tzinfos={x: utc for x in dateutil.parser.parserinfo().UTCZONE}
-        )
-        tzinfo = _rrule._dtstart.tzinfo
-        if tzinfo == utc:
-            return 'UTC'
-        fname = tzinfo._filename
-        all_zones = map(itemgetter('name'), Schedule.get_zoneinfo())
+        all_zones = Schedule.get_zoneinfo()
         all_zones.sort(key = lambda x: -len(x))
-        for zone in all_zones:
-            if fname.endswith(zone):
-                return zone
+        for r in Schedule.rrulestr(self.rrule)._rrule:
+            if r._dtstart:
+                tzinfo = r._dtstart.tzinfo
+                if tzinfo is utc:
+                    return 'UTC'
+                fname = tzinfo._filename
+                for zone in all_zones:
+                    if fname.endswith(zone):
+                        return zone
         logger.warn('Could not detect valid zoneinfo for {}'.format(self.rrule))
         return ''
 
@@ -130,6 +124,7 @@ class Schedule(CommonModel, LaunchTimeConfig):
         """
         Apply our own custom rrule parsing requirements
         """
+        tzinfos = {x: tzutc() for x in dateutil.parser.parserinfo().UTCZONE}
         kwargs['forceset'] = True
 
         #
@@ -163,7 +158,7 @@ class Schedule(CommonModel, LaunchTimeConfig):
                 # local_tz = tzfile('/usr/share/zoneinfo/America/New_York')
                 local_tz = dateutil.rrule.rrulestr(
                     rrule.replace(naive_until, naive_until + 'Z'),
-                    tzinfos={x: tzutc() for x in dateutil.parser.parserinfo().UTCZONE}
+                    tzinfos=tzinfos
                 )._dtstart.tzinfo
 
                 # Make a datetime object with tzinfo=<the DTSTART timezone>
@@ -181,7 +176,7 @@ class Schedule(CommonModel, LaunchTimeConfig):
                 # rrule is now: DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T220000Z
                 rrule = rrule.replace(naive_until, utc_until)
 
-        x = dateutil.rrule.rrulestr(rrule, **kwargs)
+        x = dateutil.rrule.rrulestr(rrule, tzinfos=tzinfos, **kwargs)
 
         for r in x._rrule:
             if r._dtstart and r._dtstart.tzinfo is None:

From 3bd54ab837fa8da21a8ba54779ac0d322842c414 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Tue, 8 May 2018 12:43:39 -0400
Subject: [PATCH 089/169] allow unicode queue names via CLI

---
 awx/main/management/commands/list_instances.py | 14 ++++++++------
 awx/main/management/commands/register_queue.py |  8 ++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/awx/main/management/commands/list_instances.py b/awx/main/management/commands/list_instances.py
index 2e6af440f7..d2f11b6e14 100644
--- a/awx/main/management/commands/list_instances.py
+++ b/awx/main/management/commands/list_instances.py
@@ -3,6 +3,7 @@
 
 from awx.main.models import Instance, InstanceGroup
 from django.core.management.base import BaseCommand
+import six
 
 
 class Command(BaseCommand):
@@ -13,10 +14,11 @@ class Command(BaseCommand):
         super(Command, self).__init__()
 
         for instance in Instance.objects.all():
-            print("hostname: {}; created: {}; heartbeat: {}; capacity: {}".format(instance.hostname, instance.created,
-                                                                                  instance.modified, instance.capacity))
+            print(six.text_type(
+                "hostname: {0.hostname}; created: {0.created}; "
+                "heartbeat: {0.modified}; capacity: {0.capacity}").format(instance))
         for instance_group in InstanceGroup.objects.all():
-            print("Instance Group: {}; created: {}; capacity: {}; members: {}".format(instance_group.name,
-                                                                                      instance_group.created,
-                                                                                      instance_group.capacity,
-                                                                                      [x.hostname for x in instance_group.instances.all()]))
+            print(six.text_type(
+                "Instance Group: {0.name}; created: {0.created}; "
+                "capacity: {0.capacity}; members: {1}").format(instance_group,
+                                                               [x.hostname for x in instance_group.instances.all()]))
diff --git a/awx/main/management/commands/register_queue.py b/awx/main/management/commands/register_queue.py
index 85c7842381..5f252a4637 100644
--- a/awx/main/management/commands/register_queue.py
+++ b/awx/main/management/commands/register_queue.py
@@ -19,11 +19,11 @@ class InstanceNotFound(Exception):
 class Command(BaseCommand):
 
     def add_arguments(self, parser):
-        parser.add_argument('--queuename', dest='queuename', type=str,
+        parser.add_argument('--queuename', dest='queuename', type=lambda s: six.text_type(s, 'utf8'),
                             help='Queue to create/update')
-        parser.add_argument('--hostnames', dest='hostnames', type=str,
+        parser.add_argument('--hostnames', dest='hostnames', type=lambda s: six.text_type(s, 'utf8'),
                             help='Comma-Delimited Hosts to add to the Queue')
-        parser.add_argument('--controller', dest='controller', type=str,
+        parser.add_argument('--controller', dest='controller', type=lambda s: six.text_type(s, 'utf8'),
                             default='', help='The controlling group (makes this an isolated group)')
         parser.add_argument('--instance_percent', dest='instance_percent', type=int, default=0,
                             help='The percentage of active instances that will be assigned to this group'),
@@ -96,7 +96,7 @@ class Command(BaseCommand):
         if options.get('hostnames'):
             hostname_list = options.get('hostnames').split(",")
 
-        with advisory_lock('instance_group_registration_%s' % queuename):
+        with advisory_lock(six.text_type('instance_group_registration_{}').format(queuename)):
             (ig, created, changed) = self.get_create_update_instance_group(queuename, inst_per, inst_min)
             if created:
                 print(six.text_type("Creating instance group {}".format(ig.name)))

From 1807d0a910de4d8d097db82542eb2f903558f868 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 8 May 2018 16:12:20 -0400
Subject: [PATCH 090/169] Activity stream clear-all bug fixes.  Re-enabled
 smart search directive test which required tweaking karma conf.

---
 .../activitystream.controller.js              |  86 +++++---
 .../factories/stream.factory.js               |  50 -----
 awx/ui/client/src/activity-stream/main.js     |   2 -
 .../shared/smart-search/queryset.service.js   |   6 +-
 .../smart-search/smart-search.controller.js   |   2 +-
 awx/ui/test/spec/karma.spec.js                |  24 ++-
 .../smart-search.directive-test.js            | 185 ++++++++----------
 awx/ui/test/spec/webpack.spec.js              |   4 +-
 8 files changed, 153 insertions(+), 206 deletions(-)
 delete mode 100644 awx/ui/client/src/activity-stream/factories/stream.factory.js

diff --git a/awx/ui/client/src/activity-stream/activitystream.controller.js b/awx/ui/client/src/activity-stream/activitystream.controller.js
index b7333b0bab..73c8f9c732 100644
--- a/awx/ui/client/src/activity-stream/activitystream.controller.js
+++ b/awx/ui/client/src/activity-stream/activitystream.controller.js
@@ -9,47 +9,69 @@
  * @name controllers.function:Activity Stream
  * @description This controller controls the activity stream.
  */
-export default ['$scope', '$state', 'subTitle', 'Stream', 'GetTargetTitle',
-    'StreamList', 'Dataset',
-    function activityStreamController($scope, $state, subTitle, Stream,
-    GetTargetTitle, list, Dataset) {
+export default ['$scope', '$state', 'subTitle', 'GetTargetTitle',
+    'StreamList', 'Dataset', '$rootScope', 'ShowDetail', 'BuildDescription',
+    function activityStreamController($scope, $state, subTitle, GetTargetTitle,
+    list, Dataset, $rootScope, ShowDetail, BuildDescription) {
 
-        init();
-        initOmitSmartTags();
+        // search init
+        $scope.list = list;
+        $scope[`${list.iterator}_dataset`] = Dataset.data;
+        $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
 
-        function init() {
-            // search init
-            $scope.list = list;
-            $scope[`${list.iterator}_dataset`] = Dataset.data;
-            $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
+        // subTitle is passed in via a resolve on the route.  If there is no subtitle
+        // generated in the resolve then we go get the targets generic title.
 
-            // subTitle is passed in via a resolve on the route.  If there is no subtitle
-            // generated in the resolve then we go get the targets generic title.
+        // Get the streams sub-title based on the target.  This scope variable is leveraged
+        // when we define the activity stream list.  Specifically it is included in the list
+        // title.
+        $scope.streamSubTitle = subTitle ? subTitle : GetTargetTitle($state.params.target);
 
-            // Get the streams sub-title based on the target.  This scope variable is leveraged
-            // when we define the activity stream list.  Specifically it is included in the list
-            // title.
-            $scope.streamSubTitle = subTitle ? subTitle : GetTargetTitle($state.params.target);
+        $rootScope.flashMessage = null;
 
-            // Open the stream
-            Stream({
-                scope: $scope
+        $scope.refreshStream = function () {
+            $state.go('.', null, {reload: true});
+        };
+
+        $scope.showDetail = function (id) {
+            ShowDetail({
+                scope: $scope,
+                activity_id: id
             });
+        };
+
+        if($scope.activities && $scope.activities.length > 0) {
+            buildUserAndDescription();
         }
 
-        // Specification of smart-tags omission from the UI is done in the route/state init.
-        // A limitation is that this specficiation is static and the key for which to be omitted from
-        // the smart-tags must be known at that time.
-        // In the case of activity stream, we won't to dynamically ommit the resource for which we are
-        // displaying the activity stream for. i.e. 'project', 'credential', etc.
-        function initOmitSmartTags() {
-            let defaults, route = _.find($state.$current.path, (step) => {
-                return step.params.hasOwnProperty('activity_search');
+        $scope.$watch('activities', function(){
+            // Watch for future update to scope.activities (like page change, column sort, search, etc)
+            buildUserAndDescription();
+        });
+
+        function buildUserAndDescription(){
+            $scope.activities.forEach(function(activity, i) {
+                // build activity.user
+                if ($scope.activities[i].summary_fields.actor) {
+                    $scope.activities[i].user = "<a href=\"/#/users/" + $scope.activities[i].summary_fields.actor.id  + "\">" +
+                        $scope.activities[i].summary_fields.actor.username + "</a>";
+                } else {
+                    $scope.activities[i].user = 'system';
+                }
+                // build description column / action text
+                BuildDescription($scope.activities[i]);
+
             });
-            if (route && $state.params.target !== undefined) {
-                defaults = route.params.activity_search.config.value;
-                defaults[$state.params.target] = null;
-            }
         }
+        
+        const route = _.find($state.$current.path, (step) => {
+            return step.params.hasOwnProperty('activity_search');
+        });
+        let defaultParams = angular.copy(route.params.activity_search.config.value);
+
+        defaultParams.or__object1__in = $state.params.activity_search.or__object1__in ? $state.params.activity_search.or__object1__in : defaultParams.or__object1__in;
+        defaultParams.or__object2__in = $state.params.activity_search.or__object2__in ? $state.params.activity_search.or__object2__in : defaultParams.or__object2__in;
+
+        $scope[`${list.iterator}_default_params`] = defaultParams;
     }
 ];
diff --git a/awx/ui/client/src/activity-stream/factories/stream.factory.js b/awx/ui/client/src/activity-stream/factories/stream.factory.js
deleted file mode 100644
index 43bef1de06..0000000000
--- a/awx/ui/client/src/activity-stream/factories/stream.factory.js
+++ /dev/null
@@ -1,50 +0,0 @@
-export default
-     function Stream($rootScope, $state, BuildDescription, ShowDetail) {
-         return function (params) {
-
-         var scope = params.scope;
-
-         $rootScope.flashMessage = null;
-
-         // descriptive title describing what AS is showing
-         scope.streamTitle = (params && params.title) ? params.title : null;
-
-         scope.refreshStream = function () {
-             $state.go('.', null, {reload: true});
-         };
-
-         scope.showDetail = function (id) {
-             ShowDetail({
-                 scope: scope,
-                 activity_id: id
-             });
-         };
-
-         if(scope.activities && scope.activities.length > 0) {
-             buildUserAndDescription();
-         }
-
-         scope.$watch('activities', function(){
-             // Watch for future update to scope.activities (like page change, column sort, search, etc)
-             buildUserAndDescription();
-         });
-
-         function buildUserAndDescription(){
-             scope.activities.forEach(function(activity, i) {
-                 // build activity.user
-                 if (scope.activities[i].summary_fields.actor) {
-                     scope.activities[i].user = "<a href=\"/#/users/" + scope.activities[i].summary_fields.actor.id  + "\">" +
-                         scope.activities[i].summary_fields.actor.username + "</a>";
-                 } else {
-                     scope.activities[i].user = 'system';
-                 }
-                 // build description column / action text
-                 BuildDescription(scope.activities[i]);
-
-             });
-         }
-
-     };
- }
-
- Stream.$inject = ['$rootScope', '$state', 'BuildDescription', 'ShowDetail'];
diff --git a/awx/ui/client/src/activity-stream/main.js b/awx/ui/client/src/activity-stream/main.js
index b1e625e2d7..383bab8d11 100644
--- a/awx/ui/client/src/activity-stream/main.js
+++ b/awx/ui/client/src/activity-stream/main.js
@@ -11,7 +11,6 @@ import streamDetailModal from './streamDetailModal/main';
 import BuildAnchor from './factories/build-anchor.factory';
 import BuildDescription from './factories/build-description.factory';
 import ShowDetail from './factories/show-detail.factory';
-import Stream from './factories/stream.factory';
 import GetTargetTitle from './get-target-title.factory';
 import ModelToBasePathKey from './model-to-base-path-key.factory';
 import ActivityDetailForm from './activity-detail.form';
@@ -23,7 +22,6 @@ export default angular.module('activityStream', [streamDetailModal.name])
     .factory('BuildAnchor', BuildAnchor)
     .factory('BuildDescription', BuildDescription)
     .factory('ShowDetail', ShowDetail)
-    .factory('Stream', Stream)
     .factory('GetTargetTitle', GetTargetTitle)
     .factory('ModelToBasePathKey', ModelToBasePathKey)
     .factory('ActivityDetailForm', ActivityDetailForm)
diff --git a/awx/ui/client/src/shared/smart-search/queryset.service.js b/awx/ui/client/src/shared/smart-search/queryset.service.js
index ba8aad5dc5..cb0b6087fc 100644
--- a/awx/ui/client/src/shared/smart-search/queryset.service.js
+++ b/awx/ui/client/src/shared/smart-search/queryset.service.js
@@ -34,8 +34,10 @@ function QuerysetService ($q, Rest, ProcessErrors, $rootScope, Wait, DjangoSearc
             return defer.promise;
         },
         replaceDefaultFlags (value) {
-            value = value.toString().replace(/__icontains_DEFAULT/g, "__icontains");
-            value = value.toString().replace(/__search_DEFAULT/g, "__search");
+            if (value) {
+                value = value.toString().replace(/__icontains_DEFAULT/g, "__icontains");
+                value = value.toString().replace(/__search_DEFAULT/g, "__search");
+            }
 
             return value;
         },
diff --git a/awx/ui/client/src/shared/smart-search/smart-search.controller.js b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
index ba481cec6e..ad14dd5344 100644
--- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
@@ -235,7 +235,7 @@ function SmartSearchController (
     };
 
     $scope.clearAllTerms = () => {
-        const cleared = _.cloneDeep(defaults);
+        const cleared = _(defaults).omit(_.isNull).value();
 
         delete cleared.page;
 
diff --git a/awx/ui/test/spec/karma.spec.js b/awx/ui/test/spec/karma.spec.js
index ae2dc8899d..dcd46a16bc 100644
--- a/awx/ui/test/spec/karma.spec.js
+++ b/awx/ui/test/spec/karma.spec.js
@@ -5,30 +5,38 @@ const NODE_MODULES = path.resolve(__dirname, '../../node_modules');
 
 const webpackConfig = require('./webpack.spec');
 
+// 'client/src/**/*.html'
+// ],
+// preprocessors: {
+// './client/src/app.js': ['webpack', 'sourcemap'],
+// './tests/**/*-test.js': ['webpack', 'sourcemap'],
+// 'client/src/**/*.html': ['html2js']
+
 module.exports = config => {
     config.set({
+        basePath: '../..',
         autoWatch: true,
         colors: true,
         browsers: ['Chrome', 'Firefox'],
         frameworks: ['jasmine'],
         reporters: ['progress', 'junit'],
         files:[
-            './polyfills.js',
-            path.join(SRC_PATH, '**/*.html'),
-            path.join(SRC_PATH, 'vendor.js'),
+            'test/spec/polyfills.js',
+            'client/src/vendor.js',
             path.join(NODE_MODULES, 'angular-mocks/angular-mocks.js'),
             path.join(SRC_PATH, 'app.js'),
-            '**/*-test.js',
+            'client/src/**/*.html',
+            'test/spec/**/*-test.js',
         ],
         preprocessors: {
-            [path.join(SRC_PATH, '**/*.html')]: 'html2js',
-            [path.join(SRC_PATH, 'vendor.js')]: 'webpack',
+            'client/src/vendor.js': 'webpack',
             [path.join(SRC_PATH, 'app.js')]: 'webpack',
-            '**/*-test.js': 'webpack'
+            'client/src/**/*.html': 'html2js',
+            'test/spec/**/*-test.js': 'webpack'
         },
         webpack: webpackConfig,
         webpackMiddleware: {
-            noInfo: true
+            noInfo: 'errors-only'
         },
         junitReporter: {
             outputDir: 'reports',
diff --git a/awx/ui/test/spec/smart-search/smart-search.directive-test.js b/awx/ui/test/spec/smart-search/smart-search.directive-test.js
index 59a701e9bc..afc6df33ed 100644
--- a/awx/ui/test/spec/smart-search/smart-search.directive-test.js
+++ b/awx/ui/test/spec/smart-search/smart-search.directive-test.js
@@ -1,7 +1,8 @@
 'use strict';
 
-xdescribe('Directive: Smart Search', () => {
+describe('Directive: Smart Search', () => {
     let $scope,
+        $q,
         template,
         element,
         dom,
@@ -9,119 +10,91 @@ xdescribe('Directive: Smart Search', () => {
         $state = {},
         $stateParams,
         GetBasePath,
-        QuerySet;
+        QuerySet,
+        ConfigService = {},
+        i18n,
+        $transitions,
+        translateFilter;
 
     beforeEach(angular.mock.module('shared'));
     beforeEach(angular.mock.module('SmartSearchModule', ($provide) => {
-        QuerySet = jasmine.createSpyObj('QuerySet', ['decodeParam']);
+        QuerySet = jasmine.createSpyObj('QuerySet', [
+            'decodeParam',
+            'search',
+            'stripDefaultParams',
+            'createSearchTagsFromQueryset',
+            'initFieldset'
+        ]);
         QuerySet.decodeParam.and.callFake((key, value) => {
             return `${key.split('__').join(':')}:${value}`;
         });
-        GetBasePath = jasmine.createSpy('GetBasePath');
+        QuerySet.stripDefaultParams.and.returnValue([]);
+        QuerySet.createSearchTagsFromQueryset.and.returnValue([]);
 
+        $transitions = jasmine.createSpyObj('$transitions', [
+            'onSuccess'
+        ]);
+        $transitions.onSuccess.and.returnValue({});
+
+        ConfigService = jasmine.createSpyObj('ConfigService', [
+            'getConfig'
+        ]);
+
+        GetBasePath = jasmine.createSpy('GetBasePath');
+        translateFilter = jasmine.createSpy('translateFilter');
+        i18n = jasmine.createSpy('i18n');
+        $state = jasmine.createSpyObj('$state', ['go']);
+
+        $provide.value('ConfigService', ConfigService);
         $provide.value('QuerySet', QuerySet);
         $provide.value('GetBasePath', GetBasePath);
         $provide.value('$state', $state);
+        $provide.value('i18n', { '_': (a) => { return a; } });
+        $provide.value('translateFilter', translateFilter);
     }));
-    beforeEach(angular.mock.inject(($templateCache, _$rootScope_, _$compile_) => {
+    beforeEach(angular.mock.inject(($templateCache, _$rootScope_, _$compile_, _$q_) => {
+        $q = _$q_;
+        $compile = _$compile_;
+        $scope = _$rootScope_.$new();
+
+        ConfigService.getConfig.and.returnValue($q.when({}));
+        QuerySet.search.and.returnValue($q.when({}));
+
+        QuerySet.initFieldset.and.callFake(() => {
+            var deferred = $q.defer();
+            deferred.resolve({
+                models: {
+                    mock: {
+                        base: {}
+                    }
+                },
+                options: {
+                    data: null
+                }
+            });
+            return deferred.promise;
+        });
+
         // populate $templateCache with directive.templateUrl at test runtime,
         template = window.__html__['client/src/shared/smart-search/smart-search.partial.html'];
         $templateCache.put('/static/partials/shared/smart-search/smart-search.partial.html', template);
-
-        $compile = _$compile_;
-        $scope = _$rootScope_.$new();
     }));
 
-    describe('initializing tags', () => {
-        beforeEach(() => {
-            QuerySet.initFieldset = function() {
-                return {
-                    then: function() {
-                        return;
-                    }
-                };
-            };
-        });
-        // some defaults like page_size and page will always be provided
-        // but should be squashed if initialized with default values
-        it('should not create tags', () => {
+    describe('clear all', () => {
+        it('should revert search back to non-null defaults and remove page', () => {
             $state.$current = {
-                params: {
-                    mock_search: {
-                        config: {
-                            value: {
-                                page_size: '20',
-                                order_by: '-finished',
-                                page: '1'
-                            }
-                        }
-                    }
-                }
-            };
-            $state.params = {
-                mock_search: {
-                    page_size: '20',
-                    order_by: '-finished',
-                    page: '1'
-                }
-            };
-            dom = angular.element(`<smart-search
-                django-model="mock"
-                search-size="mock"
-                base-path="mock"
-                iterator="mock"
-                collection="dataset"
-                search-tags="searchTags"
-                >
-                </smart-search>`);
-            element = $compile(dom)($scope);
-            $scope.$digest();
-            expect($('.SmartSearch-tagContainer', element).length).toEqual(0);
-        });
-        // set one possible default (order_by) with a custom value, but not another default (page_size)
-        it('should create an order_by tag, but not a page_size tag', () => {
-            $state.$current = {
-                params: {
-                    mock_search: {
-                        config: {
-                            value: {
-                                page_size: '20',
-                                order_by: '-finished'
-                            }
-                        }
-                    }
-                }
-            };
-            $state.params = {
-                mock_search: {
-                    page_size: '20',
-                    order_by: 'name'
-                }
-            };
-            dom = angular.element(`<smart-search
-                django-model="mock"
-                search-size="mock"
-                base-path="mock"
-                iterator="mock"
-                collection="dataset"
-                search-tags="searchTags"
-                >
-                </smart-search>`);
-            element = $compile(dom)($scope);
-            $scope.$digest();
-            expect($('.SmartSearch-tagContainer', element).length).toEqual(1);
-            expect($('.SmartSearch-tagContainer .SmartSearch-name', element)[0].innerText).toEqual('order_by:name');
-        });
-        // set many possible defaults and many non-defaults - page_size and page shouldn't generate tags, even when non-default values are set
-        it('should create an order_by tag, name tag, description tag - but not a page_size or page tag', () => {
-            $state.$current = {
-                params: {
-                    mock_search: {
-                        config: {
-                            value: {
-                                page_size: '20',
-                                order_by: '-finished',
-                                page: '1'
+                path: {
+                    mock: {
+                        params: {
+                            mock_search: {
+                                config: {
+                                    value: {
+                                        page_size: '20',
+                                        order_by: '-finished',
+                                        page: '1',
+                                        some_null_param: null
+                                    }
+                                }
                             }
                         }
                     }
@@ -136,6 +109,9 @@ xdescribe('Directive: Smart Search', () => {
                     name_icontains: 'ansible'
                 }
             };
+            $scope.list = {
+                iterator: 'mock'
+            };
             dom = angular.element(`<smart-search
                 django-model="mock"
                 search-size="mock"
@@ -143,21 +119,14 @@ xdescribe('Directive: Smart Search', () => {
                 iterator="mock"
                 collection="dataset"
                 search-tags="searchTags"
+                list="list"
                 >
                 </smart-search>`);
             element = $compile(dom)($scope);
             $scope.$digest();
-            expect($('.SmartSearch-tagContainer', element).length).toEqual(3);
+            const scope = element.isolateScope();
+            scope.clearAllTerms();
+            expect(QuerySet.search).toHaveBeenCalledWith('mock', {page_size: '20',order_by: '-finished',});
         });
     });
-
-    describe('removing tags', () => {
-        // assert a default value is still provided after a custom tag is removed
-        xit('should revert to state-defined order_by when order_by tag is removed', () => {});
-    });
-
-    describe('accessing model', () => {
-        xit('should retrieve cached model OPTIONS from localStorage', () => {});
-        xit('should call QuerySet service to retrieve unstored model OPTIONS', () => {});
-    });
 });
diff --git a/awx/ui/test/spec/webpack.spec.js b/awx/ui/test/spec/webpack.spec.js
index 6ed0f049ad..099d6a9964 100644
--- a/awx/ui/test/spec/webpack.spec.js
+++ b/awx/ui/test/spec/webpack.spec.js
@@ -1,8 +1,6 @@
-const path = require('path');
-
 const webpack = require('webpack');
 const merge = require('webpack-merge');
-const base = require(path.resolve(__dirname, '../..', 'build/webpack.base'));
+const base = require('../../build/webpack.base');
 
 const STATIC_URL = '/static/';
 

From 366c1c19b0f40c29cc15e54a42b891cb96ed4387 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 8 May 2018 16:19:56 -0400
Subject: [PATCH 091/169] Removed commented lines.  Rolled back noInfo change

---
 awx/ui/test/spec/karma.spec.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/awx/ui/test/spec/karma.spec.js b/awx/ui/test/spec/karma.spec.js
index dcd46a16bc..104f8d9ba8 100644
--- a/awx/ui/test/spec/karma.spec.js
+++ b/awx/ui/test/spec/karma.spec.js
@@ -5,13 +5,6 @@ const NODE_MODULES = path.resolve(__dirname, '../../node_modules');
 
 const webpackConfig = require('./webpack.spec');
 
-// 'client/src/**/*.html'
-// ],
-// preprocessors: {
-// './client/src/app.js': ['webpack', 'sourcemap'],
-// './tests/**/*-test.js': ['webpack', 'sourcemap'],
-// 'client/src/**/*.html': ['html2js']
-
 module.exports = config => {
     config.set({
         basePath: '../..',
@@ -36,7 +29,7 @@ module.exports = config => {
         },
         webpack: webpackConfig,
         webpackMiddleware: {
-            noInfo: 'errors-only'
+            noInfo: true
         },
         junitReporter: {
             outputDir: 'reports',

From ffdf4063003ed749cc7ca79d1d7bc8509e0151fe Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 8 May 2018 17:09:52 -0400
Subject: [PATCH 092/169] reorder fields and make redirect_uri field not
 required on app form

---
 .../features/applications/add-applications.controller.js    | 1 -
 .../features/applications/add-edit-applications.view.html   | 6 +++---
 .../features/applications/edit-applications.controller.js   | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/features/applications/add-applications.controller.js b/awx/ui/client/features/applications/add-applications.controller.js
index 486c20dffb..c848bcd345 100644
--- a/awx/ui/client/features/applications/add-applications.controller.js
+++ b/awx/ui/client/features/applications/add-applications.controller.js
@@ -46,7 +46,6 @@ function AddApplicationsController (models, $state, strings) {
 
     vm.form.name.required = true;
     vm.form.organization.required = true;
-    vm.form.redirect_uris.required = true;
 
     delete vm.form.name.help_text;
 
diff --git a/awx/ui/client/features/applications/add-edit-applications.view.html b/awx/ui/client/features/applications/add-edit-applications.view.html
index 9f2bbb96d3..a7f2a87580 100644
--- a/awx/ui/client/features/applications/add-edit-applications.view.html
+++ b/awx/ui/client/features/applications/add-edit-applications.view.html
@@ -14,9 +14,9 @@
             <at-input-text col="4" tab="2" state="vm.form.description"></at-input-text>
             <at-input-lookup col="4" tab="3" state="vm.form.organization"></at-input-lookup>
             <at-divider></at-divider>
-            <at-input-text col="4" tab="4" state="vm.form.redirect_uris"></at-input-text>
-            <at-input-select col="4" tab="5" state="vm.form.client_type"></at-input-select>
-            <at-input-select col="4" tab="6" state="vm.form.authorization_grant_type"></at-input-select>
+            <at-input-select col="4" tab="4" state="vm.form.authorization_grant_type"></at-input-select>
+            <at-input-text col="4" tab="5" state="vm.form.redirect_uris"></at-input-text>
+            <at-input-select col="4" tab="6" state="vm.form.client_type"></at-input-select>
 
             <at-action-group col="12" pos="right">
                 <at-form-action type="cancel" to="applications"></at-form-action>
diff --git a/awx/ui/client/features/applications/edit-applications.controller.js b/awx/ui/client/features/applications/edit-applications.controller.js
index 60b08be6ba..1bf6b8c91b 100644
--- a/awx/ui/client/features/applications/edit-applications.controller.js
+++ b/awx/ui/client/features/applications/edit-applications.controller.js
@@ -53,7 +53,6 @@ function EditApplicationsController (models, $state, strings, $scope) {
     vm.form.disabled = !isEditable;
 
     vm.form.name.required = true;
-    vm.form.redirect_uris.required = true;
 
     const isOrgAdmin = _.some(me.get('related.admin_of_organizations.results'), (org) => org.id === organization.get('id'));
     const isSuperuser = me.get('is_superuser');

From ece5724c808515e92123907a82e1d9bc271f2860 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Tue, 8 May 2018 19:31:24 -0400
Subject: [PATCH 093/169] Added completed jobs tab to the workflow form

---
 .../workflowJobTemplateCompletedJobs.route.js | 59 +++++++++++++++++++
 awx/ui/client/src/templates/main.js           |  2 +
 awx/ui/client/src/templates/workflows.form.js |  5 ++
 3 files changed, 66 insertions(+)
 create mode 100644 awx/ui/client/features/jobs/routes/workflowJobTemplateCompletedJobs.route.js

diff --git a/awx/ui/client/features/jobs/routes/workflowJobTemplateCompletedJobs.route.js b/awx/ui/client/features/jobs/routes/workflowJobTemplateCompletedJobs.route.js
new file mode 100644
index 0000000000..8970ef8bc0
--- /dev/null
+++ b/awx/ui/client/features/jobs/routes/workflowJobTemplateCompletedJobs.route.js
@@ -0,0 +1,59 @@
+import { N_ } from '../../../src/i18n';
+import jobsListController from '../jobsList.controller';
+
+const jobsListTemplate = require('~features/jobs/jobsList.view.html');
+
+export default {
+    url: '/completed_jobs',
+    name: 'templates.editWorkflowJobTemplate.completed_jobs',
+    params: {
+        job_search: {
+            value: {
+                page_size: '20',
+                workflow_job__workflow_job_template: '',
+                order_by: '-id'
+            },
+            dynamic: true,
+            squash: ''
+        }
+    },
+    ncyBreadcrumb: {
+        label: N_('COMPLETED JOBS')
+    },
+    views: {
+        related: {
+            templateUrl: jobsListTemplate,
+            controller: jobsListController,
+            controllerAs: 'vm'
+        }
+    },
+    resolve: {
+        resolvedModels: [
+            'UnifiedJobModel',
+            (UnifiedJob) => {
+                const models = [
+                    new UnifiedJob(['options']),
+                ];
+                return Promise.all(models);
+            },
+        ],
+        Dataset: [
+            '$stateParams',
+            'Wait',
+            'GetBasePath',
+            'QuerySet',
+            ($stateParams, Wait, GetBasePath, qs) => {
+                const templateId = $stateParams.workflow_job_template_id;
+
+                const searchParam = _.assign($stateParams
+                    .job_search, { workflow_job__workflow_job_template: templateId });
+
+                const searchPath = GetBasePath('unified_jobs');
+
+                Wait('start');
+                return qs.search(searchPath, searchParam)
+                    .finally(() => Wait('stop'));
+            }
+        ]
+    }
+};
diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js
index 5a77520a5c..ac0c5036a0 100644
--- a/awx/ui/client/src/templates/main.js
+++ b/awx/ui/client/src/templates/main.js
@@ -20,6 +20,7 @@ import InventorySourcesList from './inventory-sources.list';
 import TemplateList from './templates.list';
 import listRoute from '~features/templates/routes/templatesList.route.js';
 import templateCompletedJobsRoute from '~features/jobs/routes/templateCompletedJobs.route.js';
+import workflowJobTemplateCompletedJobsRoute from '~features/jobs/routes/workflowJobTemplateCompletedJobs.route.js';
 
 export default
 angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, prompt.name, workflowAdd.name, workflowEdit.name,
@@ -746,6 +747,7 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
                         }, [
                             stateExtender.buildDefinition(listRoute),
                             stateExtender.buildDefinition(templateCompletedJobsRoute),
+                            stateExtender.buildDefinition(workflowJobTemplateCompletedJobsRoute),
                             stateExtender.buildDefinition(workflowMaker)
                         ])
                     };
diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js
index 33c9568eef..5812ed7435 100644
--- a/awx/ui/client/src/templates/workflows.form.js
+++ b/awx/ui/client/src/templates/workflows.form.js
@@ -176,6 +176,11 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
                 },
                 "notifications": {
                     include: "NotificationsList"
+                },
+                "completed_jobs": {
+                    title: i18n._('Completed Jobs'),
+                    skipGenerator: true,
+                    ngClick: "$state.go('templates.editWorkflowJobTemplate.completed_jobs')"
                 }
             },
 

From bbfabd27794b36cf57427616751292fe886356e6 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Tue, 8 May 2018 09:44:23 -0400
Subject: [PATCH 094/169] include full stack trace for DB settings error

---
 awx/conf/settings.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/awx/conf/settings.py b/awx/conf/settings.py
index 5770f9052d..2f7970ec2b 100644
--- a/awx/conf/settings.py
+++ b/awx/conf/settings.py
@@ -5,6 +5,8 @@ import logging
 import sys
 import threading
 import time
+import StringIO
+import traceback
 
 import six
 
@@ -62,11 +64,19 @@ __all__ = ['SettingsWrapper', 'get_settings_to_cache', 'SETTING_CACHE_NOTSET']
 def _log_database_error():
     try:
         yield
-    except (ProgrammingError, OperationalError) as e:
+    except (ProgrammingError, OperationalError):
         if 'migrate' in sys.argv and get_tower_migration_version() < '310':
             logger.info('Using default settings until version 3.1 migration.')
         else:
-            logger.warning('Database settings are not available, using defaults (%s)', e, exc_info=True)
+            # Somewhat ugly - craming the full stack trace into the log message
+            # the available exc_info does not give information about the real caller
+            # TODO: replace in favor of stack_info kwarg in python 3
+            sio = StringIO.StringIO()
+            traceback.print_stack(file=sio)
+            sinfo = sio.getvalue()
+            sio.close()
+            sinfo = sinfo.strip('\n')
+            logger.warning('Database settings are not available, using defaults, logged from:\n{}'.format(sinfo))
     finally:
         pass
 

From 39827af902494f4d48955d072b2021eff1411540 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Wed, 9 May 2018 12:37:00 -0400
Subject: [PATCH 095/169] Fixed jt launch next button disabled when prompting
 for inventory

---
 awx/ui/client/src/templates/prompt/prompt.partial.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/templates/prompt/prompt.partial.html b/awx/ui/client/src/templates/prompt/prompt.partial.html
index 79b23eedd8..820ea8553d 100644
--- a/awx/ui/client/src/templates/prompt/prompt.partial.html
+++ b/awx/ui/client/src/templates/prompt/prompt.partial.html
@@ -30,7 +30,7 @@
         </div>
         <div class="Prompt-footer">
             <button class="Prompt-defaultButton" ng-click="vm.cancel()">{{:: vm.strings.get('CANCEL') }}</button>
-            <button class="Prompt-actionButton" ng-show="vm.steps.inventory.tab._active" ng-click="vm.next(vm.steps.inventory.tab)" ng-disabled="!vm.vm.promptDataClone.prompts.inventory.value.id">{{:: vm.strings.get('NEXT') }}</button>
+            <button class="Prompt-actionButton" ng-show="vm.steps.inventory.tab._active" ng-click="vm.next(vm.steps.inventory.tab)" ng-disabled="!vm.promptDataClone.prompts.inventory.value.id">{{:: vm.strings.get('NEXT') }}</button>
             <button class="Prompt-actionButton"
                 ng-show="vm.steps.credential.tab._active"
                 ng-click="vm.next(vm.steps.credential.tab)"

From a02521a0bda7ab1eee1e92d441b95a39352d1fea Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Wed, 9 May 2018 13:03:58 -0400
Subject: [PATCH 096/169] Only initialize extra vars if they are promptable

---
 .../src/scheduler/schedulerAdd.controller.js  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
index 49e143fa1a..72d7137ae7 100644
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@@ -92,14 +92,6 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
     // extra_data field is not manifested in the UI when scheduling a Management Job
     if ($state.current.name === 'jobTemplateSchedules.add'){
         $scope.parseType = 'yaml';
-        $scope.extraVars = ParentObject.extra_vars === '' ? '---' : ParentObject.extra_vars;
-
-        ParseTypeChange({
-            scope: $scope,
-            variable: 'extraVars',
-            parse_variable: 'parseType',
-            field_id: 'SchedulerForm-extraVars'
-        });
 
         let jobTemplate = new JobTemplate();
 
@@ -126,7 +118,16 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
                     });
                 };
 
-                if (!launchConf.ask_variables_on_launch) {
+                if (launchConf.ask_variables_on_launch) {
+                    $scope.extraVars = ParentObject.extra_vars === '' ? '---' : ParentObject.extra_vars;
+
+                    ParseTypeChange({
+                        scope: $scope,
+                        variable: 'extraVars',
+                        parse_variable: 'parseType',
+                        field_id: 'SchedulerForm-extraVars'
+                    });
+                } else {
                     $scope.noVars = true;
                 }
 

From 9218a89589333d85bea692bf7dce1670ada39f86 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Wed, 9 May 2018 13:21:15 -0400
Subject: [PATCH 097/169] Added error message to "Days of data to keep" when
 the user inputs a value less than one

---
 .../src/management-jobs/scheduler/schedulerForm.partial.html     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
index a735e4c825..89bd1c56df 100644
--- a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
@@ -166,6 +166,7 @@
                 <input type="number" sch-spinner="scheduler_form" class="scheduler-time-spinner SchedulerTime-input SpinnerInput RepeatFrequencyOptions-number" name="schedulerPurgeDays" id="schedulerPurgeDays" min="1" aw-spinner="schedulerPurgeDays" ng-model="schedulerPurgeDays" required placeholder="Days of data to keep" ng-disabled="!(schedule_obj.summary_fields.user_capabilities.edit || canAdd)">
                 <div class="error" ng-show="scheduler_form.schedulerPurgeDays.$dirty && scheduler_form.schedulerPurgeDays.$error.required" translate>A value is required.</div>
                 <div class="error" ng-show="scheduler_form.schedulerPurgeDays.$error.number" translate>This is not a valid number.</div>
+                <div class="error" ng-show="scheduler_form.schedulerPurgeDays.$error.min" translate>Please input a number greater than 1.</div>
             </div>
             <div class="RepeatFrequencyOptions-label"
                 ng-show="schedulerFrequency.value && schedulerFrequency.value !== 'none'">

From eccf3029b4c1d3d08da9961298fbbdb323fc0a2e Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Wed, 9 May 2018 14:16:46 -0400
Subject: [PATCH 098/169] Fixed bug deleting last team/user permission on page

---
 .../src/access/permissions-list.controller.js     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/src/access/permissions-list.controller.js b/awx/ui/client/src/access/permissions-list.controller.js
index b50293d74a..ff132d211f 100644
--- a/awx/ui/client/src/access/permissions-list.controller.js
+++ b/awx/ui/client/src/access/permissions-list.controller.js
@@ -14,6 +14,17 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE
             $scope[`${list.iterator}s`] = $scope[`${list.iterator}_dataset`].results;
         }
 
+        let reloadAfterDelete = () => {
+            let reloadListStateParams = null;
+
+            if($scope.permissions.length === 1 && $state.params.permission_search && _.has($state, 'params.permission_search.page') && parseInt($state.params.permission_search.page).toString() !== '1') {
+                reloadListStateParams = _.cloneDeep($state.params);
+                reloadListStateParams.permission_search.page = (parseInt(reloadListStateParams.permission_search.page)-1).toString();
+            }
+
+            $state.go('.', reloadListStateParams, {reload: true});
+        };
+
         $scope.deletePermissionFromUser = function(userId, userName, roleName, roleType, url) {
 
             var action = function() {
@@ -23,7 +34,7 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE
                 Rest.post({ "disassociate": true, "id": Number(userId) })
                     .then(() => {
                         Wait('stop');
-                        $state.go('.', null, {reload: true});
+                        reloadAfterDelete();
                     })
                     .catch(({data, status}) => {
                         ProcessErrors($scope, data, status, null, {
@@ -56,7 +67,7 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE
                 Rest.post({ "disassociate": true, "id": teamId })
                     .then(() => {
                         Wait('stop');
-                        $state.go('.', null, {reload: true});
+                        reloadAfterDelete();
                     })
                     .catch(({data, status}) => {
                         ProcessErrors($scope, data, status, null, {

From 056933e33ec1b5add4318251f2988b5c3815b789 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Wed, 9 May 2018 15:00:48 -0400
Subject: [PATCH 099/169] refactor naive UNTIL= coercion

---
 awx/main/models/schedules.py | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/awx/main/models/schedules.py b/awx/main/models/schedules.py
index 787e69da0b..dabf7fba10 100644
--- a/awx/main/models/schedules.py
+++ b/awx/main/models/schedules.py
@@ -31,6 +31,9 @@ logger = logging.getLogger('awx.main.models.schedule')
 __all__ = ['Schedule']
 
 
+UTC_TIMEZONES = {x: tzutc() for x in dateutil.parser.parserinfo().UTCZONE}
+
+
 class ScheduleFilterMethods(object):
 
     def enabled(self, enabled=True):
@@ -120,13 +123,7 @@ class Schedule(CommonModel, LaunchTimeConfig):
         return ''
 
     @classmethod
-    def rrulestr(cls, rrule, **kwargs):
-        """
-        Apply our own custom rrule parsing requirements
-        """
-        tzinfos = {x: tzutc() for x in dateutil.parser.parserinfo().UTCZONE}
-        kwargs['forceset'] = True
-
+    def coerce_naive_until(cls, rrule):
         #
         # RFC5545 specifies that the UNTIL rule part MUST ALWAYS be a date
         # with UTC time.  This is extra work for API implementers because
@@ -158,7 +155,7 @@ class Schedule(CommonModel, LaunchTimeConfig):
                 # local_tz = tzfile('/usr/share/zoneinfo/America/New_York')
                 local_tz = dateutil.rrule.rrulestr(
                     rrule.replace(naive_until, naive_until + 'Z'),
-                    tzinfos=tzinfos
+                    tzinfos=UTC_TIMEZONES
                 )._dtstart.tzinfo
 
                 # Make a datetime object with tzinfo=<the DTSTART timezone>
@@ -175,8 +172,16 @@ class Schedule(CommonModel, LaunchTimeConfig):
                 # rrule was:    DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T170000
                 # rrule is now: DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T220000Z
                 rrule = rrule.replace(naive_until, utc_until)
+        return rrule
 
-        x = dateutil.rrule.rrulestr(rrule, tzinfos=tzinfos, **kwargs)
+    @classmethod
+    def rrulestr(cls, rrule, **kwargs):
+        """
+        Apply our own custom rrule parsing requirements
+        """
+        rrule = Schedule.coerce_naive_until(rrule)
+        kwargs['forceset'] = True
+        x = dateutil.rrule.rrulestr(rrule, tzinfos=UTC_TIMEZONES, **kwargs)
 
         for r in x._rrule:
             if r._dtstart and r._dtstart.tzinfo is None:
@@ -234,4 +239,5 @@ class Schedule(CommonModel, LaunchTimeConfig):
 
     def save(self, *args, **kwargs):
         self.update_computed_fields()
+        self.rrule = Schedule.coerce_naive_until(self.rrule)
         super(Schedule, self).save(*args, **kwargs)

From 3b5dd7eac50a3b57e23f9a76b2fbfb5d8b6bdc56 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Tue, 8 May 2018 23:55:48 -0400
Subject: [PATCH 100/169] error handling for job results filter and route

---
 awx/ui/client/features/output/index.js        | 22 +++++-
 .../features/output/search.component.js       | 67 +++++++++++--------
 .../features/output/search.partial.html       |  3 +
 3 files changed, 60 insertions(+), 32 deletions(-)

diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js
index 6b14296553..813d1c2af3 100644
--- a/awx/ui/client/features/output/index.js
+++ b/awx/ui/client/features/output/index.js
@@ -26,6 +26,7 @@ const PAGE_SIZE = 50;
 const WS_PREFIX = 'ws';
 
 function resolveResource (
+    $state,
     Job,
     ProjectUpdate,
     AdHocCommand,
@@ -36,7 +37,9 @@ function resolveResource (
     qs,
     Wait
 ) {
-    const { id, type, job_event_search } = $stateParams; // eslint-disable-line camelcase
+    const { id, type, handleErrors } = $stateParams;
+    const { job_event_search } = $stateParams; // eslint-disable-line camelcase
+
     const { name, key } = getWebSocketResource(type);
 
     let Resource;
@@ -77,7 +80,7 @@ function resolveResource (
     }
 
     Wait('start');
-    return new Resource(['get', 'options'], [id, id])
+    const resourcePromise = new Resource(['get', 'options'], [id, id])
         .then(model => {
             const promises = [model.getStats()];
 
@@ -105,8 +108,17 @@ function resolveResource (
                 pageLimit: PAGE_LIMIT
             }
         }))
-        .catch(({ data, status }) => qs.error(data, status))
         .finally(() => Wait('stop'));
+
+    if (!handleErrors) {
+        return resourcePromise;
+    }
+
+    return resourcePromise
+        .catch(({ data, status }) => {
+            $state.go($state.current, $state.params, { reload: true });
+            qs.error(data, status);
+        });
 }
 
 function resolveWebSocketConnection ($stateParams, SocketService) {
@@ -168,6 +180,9 @@ function JobsRun ($stateRegistry, strings) {
         name: 'output',
         parent,
         ncyBreadcrumb,
+        params: {
+            handleErrors: true,
+        },
         data: {
             activityStream: false,
         },
@@ -185,6 +200,7 @@ function JobsRun ($stateRegistry, strings) {
                 resolveWebSocketConnection
             ],
             resource: [
+                '$state',
                 'JobModel',
                 'ProjectUpdateModel',
                 'AdHocCommandModel',
diff --git a/awx/ui/client/features/output/search.component.js b/awx/ui/client/features/output/search.component.js
index d1e37edd14..b1f40efd3e 100644
--- a/awx/ui/client/features/output/search.component.js
+++ b/awx/ui/client/features/output/search.component.js
@@ -1,11 +1,13 @@
 const templateUrl = require('~features/output/search.partial.html');
 
-const searchReloadOptions = { reload: true, inherit: false };
+const searchReloadOptions = { inherit: false, location: 'replace' };
 const searchKeyExamples = ['id:>1', 'task:set', 'created:>=2000-01-01'];
 const searchKeyFields = ['changed', 'failed', 'host_name', 'stdout', 'task', 'role', 'playbook', 'play'];
 
 const PLACEHOLDER_RUNNING = 'CANNOT SEARCH RUNNING JOB';
 const PLACEHOLDER_DEFAULT = 'SEARCH';
+const REJECT_DEFAULT = 'Failed to update search results.';
+const REJECT_INVALID = 'Invalid search filter provided.';
 
 let $state;
 let qs;
@@ -30,38 +32,46 @@ function getSearchTags (queryset) {
         .filter(tag => !tag.startsWith('order_by'));
 }
 
+function reloadQueryset (queryset, rejection = REJECT_DEFAULT) {
+    const params = angular.copy($state.params);
+    const currentTags = vm.tags;
+
+    params.handleErrors = false;
+    params.job_event_search = qs.encodeArr(queryset);
+
+    vm.disabled = true;
+    vm.message = '';
+    vm.tags = getSearchTags(queryset);
+
+    return $state.transitionTo($state.current, params, searchReloadOptions)
+        .catch(() => {
+            vm.tags = currentTags;
+            vm.message = rejection;
+            vm.rejected = true;
+            vm.disabled = false;
+        });
+}
+
 function removeSearchTag (index) {
     const searchTerm = vm.tags[index];
 
     const currentQueryset = getCurrentQueryset();
     const modifiedQueryset = qs.removeTermsFromQueryset(currentQueryset, searchTerm);
 
-    vm.tags = getSearchTags(modifiedQueryset);
-    vm.disabled = true;
-
-    $state.params.job_event_search = qs.encodeArr(modifiedQueryset);
-    $state.transitionTo($state.current, $state.params, searchReloadOptions);
+    reloadQueryset(modifiedQueryset);
 }
 
 function submitSearch () {
-    const searchInputQueryset = qs.getSearchInputQueryset(vm.value);
-
     const currentQueryset = getCurrentQueryset();
+
+    const searchInputQueryset = qs.getSearchInputQueryset(vm.value);
     const modifiedQueryset = qs.mergeQueryset(currentQueryset, searchInputQueryset);
 
-    vm.tags = getSearchTags(modifiedQueryset);
-    vm.disabled = true;
-
-    $state.params.job_event_search = qs.encodeArr(modifiedQueryset);
-    $state.transitionTo($state.current, $state.params, searchReloadOptions);
+    reloadQueryset(modifiedQueryset, REJECT_INVALID);
 }
 
 function clearSearch () {
-    vm.tags = [];
-    vm.disabled = true;
-
-    $state.params.job_event_search = '';
-    $state.transitionTo($state.current, $state.params, searchReloadOptions);
+    reloadQueryset();
 }
 
 function JobSearchController (_$state_, _qs_, { subscribe }) {
@@ -70,15 +80,12 @@ function JobSearchController (_$state_, _qs_, { subscribe }) {
 
     vm = this || {};
 
-    vm.value = '';
-    vm.key = false;
-    vm.rejected = false;
-    vm.disabled = true;
-    vm.tags = getSearchTags(getCurrentQueryset());
+    vm.examples = searchKeyExamples;
+    vm.fields = searchKeyFields;
+    vm.relatedFields = [];
+    vm.placeholder = PLACEHOLDER_DEFAULT;
 
     vm.clearSearch = clearSearch;
-    vm.searchKeyExamples = searchKeyExamples;
-    vm.searchKeyFields = searchKeyFields;
     vm.toggleSearchKey = toggleSearchKey;
     vm.removeSearchTag = removeSearchTag;
     vm.submitSearch = submitSearch;
@@ -86,10 +93,12 @@ function JobSearchController (_$state_, _qs_, { subscribe }) {
     let unsubscribe;
 
     vm.$onInit = () => {
-        vm.examples = searchKeyExamples;
-        vm.fields = searchKeyFields;
-        vm.placeholder = PLACEHOLDER_DEFAULT;
-        vm.relatedFields = [];
+        vm.value = '';
+        vm.message = '';
+        vm.key = false;
+        vm.rejected = false;
+        vm.disabled = true;
+        vm.tags = getSearchTags(getCurrentQueryset());
 
         unsubscribe = subscribe(({ running }) => {
             vm.disabled = running;
diff --git a/awx/ui/client/features/output/search.partial.html b/awx/ui/client/features/output/search.partial.html
index d7acedc3d4..c209394815 100644
--- a/awx/ui/client/features/output/search.partial.html
+++ b/awx/ui/client/features/output/search.partial.html
@@ -28,6 +28,9 @@
         </button>
     </span>
 </div>
+<p ng-if="vm.rejected" class="at-InputMessage--rejected">
+    {{ vm.message }}
+</p>
 </form>
 
 <div class="jobz-tagz">

From c52eb0f327315ca3a412a94ad28f7b3973ec7056 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Wed, 9 May 2018 15:11:02 -0400
Subject: [PATCH 101/169] provide a naive UNTIL= datestamp for schedules for UI
 convenience

---
 awx/api/serializers.py                        |  7 +-
 awx/main/models/schedules.py                  | 11 +++
 .../tests/functional/models/test_schedule.py  | 68 +++++++++++++++++++
 3 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index b1e62b8613..8e8b9930c5 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -4512,14 +4512,19 @@ class ScheduleSerializer(LaunchConfigurationBaseSerializer, SchedulePreviewSeria
     show_capabilities = ['edit', 'delete']
 
     timezone = serializers.SerializerMethodField()
+    until = serializers.SerializerMethodField()
 
     class Meta:
         model = Schedule
-        fields = ('*', 'unified_job_template', 'enabled', 'dtstart', 'dtend', 'rrule', 'next_run', 'timezone',)
+        fields = ('*', 'unified_job_template', 'enabled', 'dtstart', 'dtend', 'rrule', 'next_run', 'timezone',
+                  'until')
 
     def get_timezone(self, obj):
         return obj.timezone
 
+    def get_until(self, obj):
+        return obj.until
+
     def get_related(self, obj):
         res = super(ScheduleSerializer, self).get_related(obj)
         res.update(dict(
diff --git a/awx/main/models/schedules.py b/awx/main/models/schedules.py
index dabf7fba10..13048dcf7d 100644
--- a/awx/main/models/schedules.py
+++ b/awx/main/models/schedules.py
@@ -122,6 +122,17 @@ class Schedule(CommonModel, LaunchTimeConfig):
         logger.warn('Could not detect valid zoneinfo for {}'.format(self.rrule))
         return ''
 
+    @property
+    def until(self):
+        # The UNTIL= datestamp (if any) coerced from UTC to the local naive time
+        # of the DTSTART
+        for r in Schedule.rrulestr(self.rrule)._rrule:
+            if r._until:
+                local_until = r._until.astimezone(r._dtstart.tzinfo)
+                naive_until = local_until.replace(tzinfo=None)
+                return naive_until.isoformat()
+        return ''
+
     @classmethod
     def coerce_naive_until(cls, rrule):
         #
diff --git a/awx/main/tests/functional/models/test_schedule.py b/awx/main/tests/functional/models/test_schedule.py
index e89dbf017d..d18e848d97 100644
--- a/awx/main/tests/functional/models/test_schedule.py
+++ b/awx/main/tests/functional/models/test_schedule.py
@@ -206,3 +206,71 @@ def test_timezone_property(job_template, rrule, tz):
         unified_job_template=job_template
     )
     assert s.timezone == tz
+
+
+@pytest.mark.django_db
+def test_utc_until_property(job_template):
+    rrule = 'DTSTART:20380601T120000Z RRULE:FREQ=HOURLY;INTERVAL=1;UNTIL=20380601T170000Z'
+    s = Schedule(
+        name='Some Schedule',
+        rrule=rrule,
+        unified_job_template=job_template
+    )
+    s.save()
+
+    assert s.rrule.endswith('20380601T170000Z')
+    assert s.until == '2038-06-01T17:00:00'
+
+
+@pytest.mark.django_db
+def test_localized_until_property(job_template):
+    rrule = 'DTSTART;TZID=America/New_York:20380601T120000 RRULE:FREQ=HOURLY;INTERVAL=1;UNTIL=20380601T220000Z'
+    s = Schedule(
+        name='Some Schedule',
+        rrule=rrule,
+        unified_job_template=job_template
+    )
+    s.save()
+
+    assert s.rrule.endswith('20380601T220000Z')
+    assert s.until == '2038-06-01T17:00:00'
+
+
+@pytest.mark.django_db
+def test_utc_naive_coercion(job_template):
+    rrule = 'DTSTART:20380601T120000Z RRULE:FREQ=HOURLY;INTERVAL=1;UNTIL=20380601T170000'
+    s = Schedule(
+        name='Some Schedule',
+        rrule=rrule,
+        unified_job_template=job_template
+    )
+    s.save()
+
+    assert s.rrule.endswith('20380601T170000Z')
+    assert s.until == '2038-06-01T17:00:00'
+
+
+@pytest.mark.django_db
+def test_est_naive_coercion(job_template):
+    rrule = 'DTSTART;TZID=America/New_York:20380601T120000 RRULE:FREQ=HOURLY;INTERVAL=1;UNTIL=20380601T170000'
+    s = Schedule(
+        name='Some Schedule',
+        rrule=rrule,
+        unified_job_template=job_template
+    )
+    s.save()
+
+    assert s.rrule.endswith('20380601T220000Z')  # 5PM EDT = 10PM UTC
+    assert s.until == '2038-06-01T17:00:00'
+
+
+@pytest.mark.django_db
+def test_empty_until_property(job_template):
+    rrule = 'DTSTART;TZID=America/New_York:20380601T120000 RRULE:FREQ=HOURLY;INTERVAL=1'
+    s = Schedule(
+        name='Some Schedule',
+        rrule=rrule,
+        unified_job_template=job_template
+    )
+    s.save()
+    assert s.until == ''

From 4761e175665b775314658afbbdedff37792fe1c7 Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Wed, 9 May 2018 12:18:59 -0400
Subject: [PATCH 102/169] disabled instance stay subscribed to bcast queue

* A disabled node needs to stay subscribed to the broadcast queue
because the work to re-subscribe the node to queues when the node is
re-enabled is done over the broadcast queue.
---
 awx/main/utils/ha.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/awx/main/utils/ha.py b/awx/main/utils/ha.py
index 91b9a0c05b..49421ad4cb 100644
--- a/awx/main/utils/ha.py
+++ b/awx/main/utils/ha.py
@@ -25,10 +25,11 @@ def _add_remove_celery_worker_queues(app, controlled_instances, worker_queues, w
 
     bcast_queue_names = set([construct_bcast_queue_name(n) for n in settings.AWX_CELERY_BCAST_QUEUES_STATIC])
     all_queue_names = ig_names | hostnames | set(settings.AWX_CELERY_QUEUES_STATIC)
+    desired_queues = bcast_queue_names | (all_queue_names if instance.enabled else set())
 
-    # Remove queues that aren't in the instance group
+    # Remove queues
     for queue_name in worker_queue_names:
-        if queue_name not in all_queue_names | bcast_queue_names or not instance.enabled:
+        if queue_name not in desired_queues:
             app.control.cancel_consumer(queue_name.encode("utf8"), reply=True, destination=[worker_name])
             removed_queues.append(queue_name.encode("utf8"))
 

From 507db4e3b6cf9a0e159b04f51559ba795f1e1d1e Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Wed, 9 May 2018 14:25:40 -0700
Subject: [PATCH 103/169] sets the UNTIL time to use the "until" that is
 explicitly state on the

schedules endpoint GET response
---
 .../src/scheduler/schedulerEdit.controller.js    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index f421c61a8e..37bbf2ab6c 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -125,6 +125,21 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
         });
     }
 
+    function setUntil (scheduler) {
+        let { until } = scheduleResolve;
+        if(until !== ''){
+            const date = moment(until);
+            const endDt =  moment.parseZone(date).format("MM/DD/YYYY");
+            const endHour = date.format('HH');
+            const endMinute = date.format('mm');
+            const endSecond = date.format('ss');
+            scheduler.scope.schedulerEndDt = endDt;
+            scheduler.scope.schedulerEndHour = endHour;
+            scheduler.scope.schedulerEndMinute = endMinute;
+            scheduler.scope.schedulerEndSecond = endSecond;
+        }
+    }
+
     function init() {
         schedule = scheduleResolve;
 
@@ -161,6 +176,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
             scheduler.setRRule(schedule.rrule);
             scheduler.setName(schedule.name);
             setTimezone();
+            setUntil(scheduler);
             $scope.hideForm = false;
 
             $scope.$watchGroup(["schedulerName",

From 04b8349895a71fa69070a2a61cf2ff8aaa8c4cdf Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Wed, 9 May 2018 16:15:02 -0700
Subject: [PATCH 104/169] fixes issues with select dropdowns

and adds a search box for the timezone select dropdown
---
 .../src/scheduler/schedulerAdd.controller.js   | 18 +++++++++++++++---
 .../src/scheduler/schedulerEdit.controller.js  |  5 +++++
 .../src/scheduler/schedulerForm.partial.html   |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
index 49e143fa1a..70cf675aba 100644
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@@ -408,8 +408,20 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
         }
     });
 
-    CreateSelect2({
-        element: '.MakeSelect2',
-        multiple: false
+    var callSelect2 = function() {
+        CreateSelect2({
+            element: '.MakeSelect2',
+            multiple: false
+        });
+        $("#schedulerTimeZone").select2({
+            width:'100%',
+            containerCssClass: 'Form-dropDown',
+            placeholder: 'SEARCH'
+        });
+    };
+
+    $scope.$on("updateSchedulerSelects", function() {
+        callSelect2();
     });
+    callSelect2();
 }];
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index 37bbf2ab6c..91f7df0e61 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -87,6 +87,11 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
             element: '.MakeSelect2',
             multiple: false
         });
+        $("#schedulerTimeZone").select2({
+            width:'100%',
+            containerCssClass: 'Form-dropDown',
+            placeholder: 'SEARCH'
+        });
     };
 
     $scope.$on("updateSchedulerSelects", function() {
diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html
index 9313db7f71..38245c3a12 100644
--- a/awx/ui/client/src/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html
@@ -122,7 +122,6 @@
                 </label>
                 <select
                     ng-disabled="!(schedule_obj.summary_fields.user_capabilities.edit || canAdd)"
-                    class="MakeSelect2"
                     name="schedulerTimeZone"
                     id="schedulerTimeZone"
                     ng-model="schedulerTimeZone"
@@ -130,6 +129,7 @@
                     required class="form-control input-sm"
                     ng-change="scheduleTimeChange()" >
                 </select>
+                <option></option>
             </div>
             <div class="form-group SchedulerForm-formGroup">
                 <label class="Form-inputLabel">

From b030cdcd402a5e15e03c861c5254db8384b0abb3 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Wed, 9 May 2018 18:39:31 -0400
Subject: [PATCH 105/169] use inventory id from job args to construct inventory
 link

---
 .../features/output/details.component.js      | 46 +++++++++++++++++++
 .../features/output/details.partial.html      | 12 +++++
 2 files changed, 58 insertions(+)

diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js
index d74cea977a..ccd33bc8e0 100644
--- a/awx/ui/client/features/output/details.component.js
+++ b/awx/ui/client/features/output/details.component.js
@@ -135,6 +135,51 @@ function getJobTemplateDetails () {
     return { label, link, value, tooltip };
 }
 
+function getInventoryJobNameDetails () {
+    if (resource.model.get('type') !== 'inventory_update') {
+        return null;
+    }
+
+    const jobArgs = resource.model.get('job_args');
+
+    if (!jobArgs) {
+        return null;
+    }
+
+    let parsedJobArgs;
+
+    try {
+        parsedJobArgs = JSON.parse(jobArgs);
+    } catch (e) {
+        return null;
+    }
+
+    if (!Array.isArray(parsedJobArgs)) {
+        return null;
+    }
+
+    const jobArgIndex = parsedJobArgs.indexOf('--inventory-id');
+    const inventoryId = parsedJobArgs[jobArgIndex + 1];
+
+    if (jobArgIndex < 0) {
+        return null;
+    }
+
+    if (!Number.isInteger(parseInt(inventoryId, 10))) {
+        return null;
+    }
+
+    const name = resource.model.get('name');
+    const id = resource.model.get('id');
+
+    const label = 'Name';
+    const tooltip = strings.get('resourceTooltips.INVENTORY');
+    const value = `${id} - ${$filter('sanitize')(name)}`;
+    const link = `/#/inventories/inventory/${inventoryId}`;
+
+    return { label, link, tooltip, value };
+}
+
 function getLaunchedByDetails () {
     const createdBy = resource.model.get('summary_fields.created_by');
     const jobTemplate = resource.model.get('summary_fields.job_template');
@@ -597,6 +642,7 @@ function JobDetailsController (
         vm.skipTags = getSkipTagDetails();
         vm.extraVars = getExtraVarsDetails();
         vm.labels = getLabelDetails();
+        vm.inventoryJobName = getInventoryJobNameDetails();
 
         // Relaunch and Delete Components
         vm.job = angular.copy(_.get(resource.model, 'model.GET', {}));
diff --git a/awx/ui/client/features/output/details.partial.html b/awx/ui/client/features/output/details.partial.html
index 65e35278b0..19d7deccf0 100644
--- a/awx/ui/client/features/output/details.partial.html
+++ b/awx/ui/client/features/output/details.partial.html
@@ -40,6 +40,18 @@
 </div>
 
 <!-- LEFT PANE DETAILS GROUP -->
+<!-- INVENTORY JOB NAME  DETAIL -->
+<div class="JobResults-resultRow" ng-if="vm.inventoryJobName">
+    <label class="JobResults-resultRowLabel">{{ vm.inventoryJobName.label }}</label>
+    <div class="JobResults-resultRowText">
+        <a href="{{ vm.inventoryJobName.link }}"
+           aw-tool-tip="{{ vm.inventoryJobName.tooltip }}"
+           data-placement="top">
+            {{ vm.inventoryJobName.value }}
+        </a>
+    </div>
+</div>
+
 <!-- STATUS DETAIL -->
 <div class="JobResults-resultRow">
     <label class="JobResults-resultRowLabel">{{ vm.status.label }}</label>

From 43ea72e27846b154fedcff61bb43aa2565135b43 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Wed, 9 May 2018 19:07:23 -0400
Subject: [PATCH 106/169] show inventory source details

---
 .../client/features/output/details.component.js   | 15 +++++++++++++++
 .../client/features/output/details.partial.html   |  8 ++++++++
 2 files changed, 23 insertions(+)

diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js
index ccd33bc8e0..516555920c 100644
--- a/awx/ui/client/features/output/details.component.js
+++ b/awx/ui/client/features/output/details.component.js
@@ -180,6 +180,20 @@ function getInventoryJobNameDetails () {
     return { label, link, tooltip, value };
 }
 
+function getInventorySourceDetails () {
+    if (!resource.model.has('summary_fields.inventory_source.source')) {
+        return null;
+    }
+
+    const { source } = resource.model.get('summary_fields.inventory_source');
+    const choices = mapChoices(resource.model.options('actions.GET.source.choices'));
+
+    const label = 'Source';
+    const value = choices[source];
+
+    return { label, value };
+}
+
 function getLaunchedByDetails () {
     const createdBy = resource.model.get('summary_fields.created_by');
     const jobTemplate = resource.model.get('summary_fields.job_template');
@@ -643,6 +657,7 @@ function JobDetailsController (
         vm.extraVars = getExtraVarsDetails();
         vm.labels = getLabelDetails();
         vm.inventoryJobName = getInventoryJobNameDetails();
+        vm.inventorySource = getInventorySourceDetails();
 
         // Relaunch and Delete Components
         vm.job = angular.copy(_.get(resource.model, 'model.GET', {}));
diff --git a/awx/ui/client/features/output/details.partial.html b/awx/ui/client/features/output/details.partial.html
index 19d7deccf0..cb2b59176a 100644
--- a/awx/ui/client/features/output/details.partial.html
+++ b/awx/ui/client/features/output/details.partial.html
@@ -220,6 +220,14 @@
     </div>
 </div>
 
+<!-- INVENTORY SOURCE DETAIL -->
+<div class="JobResults-resultRow" ng-show="vm.inventorySource">
+    <label class="JobResults-resultRowLabel">{{ vm.inventorySource.label }}</label>
+    <div class="JobResults-resultRowText">
+        {{ vm.inventorySource.value }}
+    </div>
+</div>
+
 <!-- FORKS DETAIL -->
 <div class="JobResults-resultRow" ng-if="vm.forks">
     <label class="JobResults-resultRowLabel">{{ vm.forks.label }}</label>

From 4355b30afebda4c9579c7eb42e1d1fc511f17454 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Wed, 9 May 2018 19:21:43 -0400
Subject: [PATCH 107/169] show overwrite details

---
 .../features/output/details.component.js      | 24 +++++++++++++++++++
 .../features/output/details.partial.html      | 16 +++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js
index 516555920c..9112ffabbf 100644
--- a/awx/ui/client/features/output/details.component.js
+++ b/awx/ui/client/features/output/details.component.js
@@ -194,6 +194,28 @@ function getInventorySourceDetails () {
     return { label, value };
 }
 
+function getOverwriteDetails () {
+    if (!resource.model.has('overwrite')) {
+        return null;
+    }
+
+    const label = 'Overwrite';
+    const value = resource.model.get('overwrite');
+
+    return { label, value };
+}
+
+function getOverwriteVarsDetails () {
+    if (!resource.model.has('overwrite_vars')) {
+        return null;
+    }
+
+    const label = 'Overwrite Vars';
+    const value = resource.model.get('overwrite_vars');
+
+    return { label, value };
+}
+
 function getLaunchedByDetails () {
     const createdBy = resource.model.get('summary_fields.created_by');
     const jobTemplate = resource.model.get('summary_fields.job_template');
@@ -658,6 +680,8 @@ function JobDetailsController (
         vm.labels = getLabelDetails();
         vm.inventoryJobName = getInventoryJobNameDetails();
         vm.inventorySource = getInventorySourceDetails();
+        vm.overwrite = getOverwriteDetails();
+        vm.overwriteVars = getOverwriteVarsDetails();
 
         // Relaunch and Delete Components
         vm.job = angular.copy(_.get(resource.model, 'model.GET', {}));
diff --git a/awx/ui/client/features/output/details.partial.html b/awx/ui/client/features/output/details.partial.html
index cb2b59176a..5cb30e9dab 100644
--- a/awx/ui/client/features/output/details.partial.html
+++ b/awx/ui/client/features/output/details.partial.html
@@ -228,6 +228,22 @@
     </div>
 </div>
 
+<!-- OVERWRITE DETAIL -->
+<div class="JobResults-resultRow" ng-show="vm.overwrite">
+    <label class="JobResults-resultRowLabel">{{ vm.overwrite.label }}</label>
+    <div class="JobResults-resultRowText">
+        {{ vm.overwrite.value }}
+    </div>
+</div>
+
+<!-- OVERWRITE VARS DETAIL -->
+<div class="JobResults-resultRow" ng-show="vm.overwriteVars">
+    <label class="JobResults-resultRowLabel">{{ vm.overwriteVars.label }}</label>
+    <div class="JobResults-resultRowText">
+        {{ vm.overwriteVars.value }}
+    </div>
+</div>
+
 <!-- FORKS DETAIL -->
 <div class="JobResults-resultRow" ng-if="vm.forks">
     <label class="JobResults-resultRowLabel">{{ vm.forks.label }}</label>

From e19ffc1fba017cd59e83f04e7cfabc63dc817498 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Wed, 9 May 2018 19:38:51 -0400
Subject: [PATCH 108/169] show license error details

---
 awx/ui/client/features/output/details.component.js | 12 ++++++++++++
 awx/ui/client/features/output/details.partial.html |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/awx/ui/client/features/output/details.component.js b/awx/ui/client/features/output/details.component.js
index 9112ffabbf..84a97ed050 100644
--- a/awx/ui/client/features/output/details.component.js
+++ b/awx/ui/client/features/output/details.component.js
@@ -216,6 +216,17 @@ function getOverwriteVarsDetails () {
     return { label, value };
 }
 
+function getLicenseErrorDetails () {
+    if (!resource.model.has('license_error')) {
+        return null;
+    }
+
+    const label = 'License Error';
+    const value = resource.model.get('license_error');
+
+    return { label, value };
+}
+
 function getLaunchedByDetails () {
     const createdBy = resource.model.get('summary_fields.created_by');
     const jobTemplate = resource.model.get('summary_fields.job_template');
@@ -682,6 +693,7 @@ function JobDetailsController (
         vm.inventorySource = getInventorySourceDetails();
         vm.overwrite = getOverwriteDetails();
         vm.overwriteVars = getOverwriteVarsDetails();
+        vm.licenseError = getLicenseErrorDetails();
 
         // Relaunch and Delete Components
         vm.job = angular.copy(_.get(resource.model, 'model.GET', {}));
diff --git a/awx/ui/client/features/output/details.partial.html b/awx/ui/client/features/output/details.partial.html
index 5cb30e9dab..fd0d51c2d4 100644
--- a/awx/ui/client/features/output/details.partial.html
+++ b/awx/ui/client/features/output/details.partial.html
@@ -84,6 +84,14 @@
     </div>
 </div>
 
+<!-- LICENSE ERROR DETAIL -->
+<div class="JobResults-resultRow" ng-show="vm.licenseError">
+    <label class="JobResults-resultRowLabel">{{ vm.licenseError.label }}</label>
+    <div class="JobResults-resultRowText">
+        {{ vm.licenseError.value }}
+    </div>
+</div>
+
 <!-- START TIME DETAIL -->
 <div class="JobResults-resultRow" ng-if="vm.started">
     <label class="JobResults-resultRowLabel">{{ vm.started.label }}</label>

From 949895d0bc8367dc029fc6e94448d2495fe94ade Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Thu, 10 May 2018 11:13:09 -0400
Subject: [PATCH 109/169] fix team parentage being removed

---
 awx/main/fields.py                          | 4 +++-
 awx/main/models/rbac.py                     | 2 +-
 awx/main/tests/functional/test_rbac_core.py | 9 +++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/awx/main/fields.py b/awx/main/fields.py
index 5f1761277d..d63eb54002 100644
--- a/awx/main/fields.py
+++ b/awx/main/fields.py
@@ -193,8 +193,10 @@ def update_role_parentage_for_instance(instance):
     '''
     for implicit_role_field in getattr(instance.__class__, '__implicit_role_fields'):
         cur_role = getattr(instance, implicit_role_field.name)
+        original_parents = set(json.loads(cur_role.implicit_parents))
         new_parents = implicit_role_field._resolve_parent_roles(instance)
-        cur_role.parents.set(new_parents)
+        cur_role.parents.remove(*list(original_parents - new_parents))
+        cur_role.parents.add(*list(new_parents - original_parents))
         new_parents_list = list(new_parents)
         new_parents_list.sort()
         new_parents_json = json.dumps(new_parents_list)
diff --git a/awx/main/models/rbac.py b/awx/main/models/rbac.py
index ae8c5e8705..7ce8567e88 100644
--- a/awx/main/models/rbac.py
+++ b/awx/main/models/rbac.py
@@ -172,7 +172,7 @@ class Role(models.Model):
         elif accessor.__class__.__name__ == 'Team':
             return self.ancestors.filter(pk=accessor.member_role.id).exists()
         elif type(accessor) == Role:
-            return self.ancestors.filter(pk=accessor).exists()
+            return self.ancestors.filter(pk=accessor.pk).exists()
         else:
             accessor_type = ContentType.objects.get_for_model(accessor)
             roles = Role.objects.filter(content_type__pk=accessor_type.id,
diff --git a/awx/main/tests/functional/test_rbac_core.py b/awx/main/tests/functional/test_rbac_core.py
index bae3b61dc0..abec03da45 100644
--- a/awx/main/tests/functional/test_rbac_core.py
+++ b/awx/main/tests/functional/test_rbac_core.py
@@ -5,6 +5,7 @@ from awx.main.models import (
     Organization,
     Project,
 )
+from awx.main.fields import update_role_parentage_for_instance
 
 
 @pytest.mark.django_db
@@ -202,3 +203,11 @@ def test_auto_parenting():
     assert org1.admin_role.is_ancestor_of(prj2.admin_role) is False
     assert org2.admin_role.is_ancestor_of(prj1.admin_role)
     assert org2.admin_role.is_ancestor_of(prj2.admin_role)
+
+
+@pytest.mark.django_db
+def test_update_parents_keeps_teams(team, project):
+    project.update_role.parents.add(team.member_role)
+    assert team.member_role in project.update_role  # test prep sanity check
+    update_role_parentage_for_instance(project)
+    assert team.member_role in project.update_role  # actual assertion

From 6c265747183669fb092501dbc93812c128641ee6 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 10 May 2018 12:29:55 -0400
Subject: [PATCH 110/169] add new row items to token list

---
 .../client/features/users/tokens/tokens.strings.js  |  5 ++++-
 .../users/tokens/users-tokens-list.partial.html     | 13 +++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/features/users/tokens/tokens.strings.js b/awx/ui/client/features/users/tokens/tokens.strings.js
index ac0af8e15f..27b9450992 100644
--- a/awx/ui/client/features/users/tokens/tokens.strings.js
+++ b/awx/ui/client/features/users/tokens/tokens.strings.js
@@ -34,7 +34,10 @@ function TokensStrings (BaseString) {
     ns.list = {
         ROW_ITEM_LABEL_DESCRIPTION: t.s('DESCRIPTION'),
         ROW_ITEM_LABEL_EXPIRED: t.s('EXPIRATION'),
-        ROW_ITEM_LABEL_USED: t.s('LAST USED')
+        ROW_ITEM_LABEL_USED: t.s('LAST USED'),
+        ROW_ITEM_LABEL_SCOPE: t.s('SCOPE'),
+        ROW_ITEM_LABEL_APPLICATION: t.s('APPLICATION'),
+        HEADER: appName => t.s('{{ appName }} Token', { appName }),
     };
 }
 
diff --git a/awx/ui/client/features/users/tokens/users-tokens-list.partial.html b/awx/ui/client/features/users/tokens/users-tokens-list.partial.html
index e460e5ecf4..9a25c09c23 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-list.partial.html
+++ b/awx/ui/client/features/users/tokens/users-tokens-list.partial.html
@@ -25,15 +25,24 @@
     <at-row ng-repeat="token in tokens">
         <div class="at-Row-items">
             <at-row-item
-                header-value="{{ token.summary_fields.application.name }}">
+                header-value="{{ vm.strings.get('list.HEADER', token.summary_fields.application.name) }}">
             </at-row-item>
             <at-row-item
                 label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_DESCRIPTION') }}"
                 value="{{ token.description }}">
             </at-row-item>
+            <at-row-item
+                label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_SCOPE') }}"
+                value="{{ token.scope }}">
+            </at-row-item>
+            <at-row-item
+                label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_APPLICATION') }}"
+                value="{{ token.summary_fields.application.name }}"
+                value-link="/#/applications/{{ token.summary_fields.application.id }}">
+            </at-row-item>
             <at-row-item
                 label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_EXPIRED') }}"
-                value="{{ token.expriation | longDate }}">
+                value="{{ token.expires | longDate }}">
             </at-row-item>
             <at-row-item
                 label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_USED') }}"

From 0c45d917d1530eebeb9c56217f6b540c6efd8d70 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Thu, 10 May 2018 09:34:39 -0700
Subject: [PATCH 111/169] adds comment for setUntil function

---
 awx/ui/client/src/scheduler/schedulerEdit.controller.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index 91f7df0e61..e247a22322 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -130,6 +130,9 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
         });
     }
 
+    // sets the UNTIL portion of the schedule form after the angular-scheduler
+    // sets it, but this function reads the 'until' key/value pair directly
+    // from the schedule GET response. 
     function setUntil (scheduler) {
         let { until } = scheduleResolve;
         if(until !== ''){

From 956596227bc335c95b478e38a98b1d2a23470581 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 10 May 2018 12:38:56 -0400
Subject: [PATCH 112/169] use translated string for scope in tokens list

---
 .../features/users/tokens/users-tokens-list.controller.js | 8 ++++++++
 .../features/users/tokens/users-tokens-list.partial.html  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/features/users/tokens/users-tokens-list.controller.js b/awx/ui/client/features/users/tokens/users-tokens-list.controller.js
index c2fe647928..ecd3d68c39 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-list.controller.js
+++ b/awx/ui/client/features/users/tokens/users-tokens-list.controller.js
@@ -37,6 +37,14 @@ function ListTokensController (
         $scope[name] = dataset.results;
         vm.tokensCount = dataset.count;
     });
+    
+    vm.getScopeString = str => {
+        if (str === 'Read') {
+            return vm.strings.get('add.SCOPE_READ_LABEL');
+        } else if (str === 'Write') {
+            return vm.strings.get('add.SCOPE_WRITE_LABEL');
+        }
+    }
 
     vm.getLastUsed = token => {
         const lastUsed = _.get(token, 'last_used');
diff --git a/awx/ui/client/features/users/tokens/users-tokens-list.partial.html b/awx/ui/client/features/users/tokens/users-tokens-list.partial.html
index 9a25c09c23..b92d24811a 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-list.partial.html
+++ b/awx/ui/client/features/users/tokens/users-tokens-list.partial.html
@@ -33,7 +33,7 @@
             </at-row-item>
             <at-row-item
                 label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_SCOPE') }}"
-                value="{{ token.scope }}">
+                value="{{ vm.getScopeString(token.scope) }}">
             </at-row-item>
             <at-row-item
                 label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_APPLICATION') }}"

From a648ce5457b8cecccfabc2a8f8990d2666ea0b62 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Thu, 10 May 2018 13:00:32 -0400
Subject: [PATCH 113/169] Fixed bug checking for credentials to remove

---
 .../workflow-maker/workflow-maker.controller.js      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
index a4119b4a79..efe7bf6642 100644
--- a/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
+++ b/awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.controller.js
@@ -221,11 +221,15 @@ export default ['$scope', 'WorkflowService', 'GetBasePath', 'TemplatesService',
                                  });
                              });
 
-                             let credentialsToRemove = params.node.promptData.prompts.credentials.previousOverrides.filter(function(priorCred) {
-                                 return !credentialsNotInPriorCredentials.some(function(credNotInPrior) {
-                                     return priorCred.id === credNotInPrior.id;
+                             let credentialsToRemove = [];
+
+                             if (_.has(params, 'node.promptData.prompts.credentials.previousOverrides')) {
+                                 credentialsToRemove = params.node.promptData.prompts.credentials.previousOverrides.filter(function(priorCred) {
+                                     return !credentialsNotInPriorCredentials.some(function(credNotInPrior) {
+                                         return priorCred.id === credNotInPrior.id;
+                                     });
                                  });
-                             });
+                             }
 
                              credentialsToAdd.forEach((credentialToAdd) => {
                                  credentialRequests.push({

From 77eea40d0baa18fe98acca26f825f0b2f8e54e58 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 10 May 2018 13:38:56 -0400
Subject: [PATCH 114/169] use app name as part of delete token confirmation
 modal header

---
 .../features/users/tokens/users-tokens-list.controller.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/features/users/tokens/users-tokens-list.controller.js b/awx/ui/client/features/users/tokens/users-tokens-list.controller.js
index ecd3d68c39..fdeb821dcf 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-list.controller.js
+++ b/awx/ui/client/features/users/tokens/users-tokens-list.controller.js
@@ -103,7 +103,7 @@ function ListTokensController (
 
         Prompt({
             hdr: strings.get('deleteResource.HEADER'),
-            resourceName: 'token',
+            resourceName: strings.get('list.HEADER', tok.summary_fields.application.name),
             body: deleteModalBody,
             action,
             actionText: strings.get('add.DELETE_ACTION_LABEL')

From 924cb51d51e1e8ba079b4c9ca7e9193fa9bb4175 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 10 May 2018 13:45:46 -0400
Subject: [PATCH 115/169] make delete of app work when you are on app's tokens
 route

---
 .../features/applications/list-applications.controller.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/features/applications/list-applications.controller.js b/awx/ui/client/features/applications/list-applications.controller.js
index 8a6ad5a8bf..b9353f8d88 100644
--- a/awx/ui/client/features/applications/list-applications.controller.js
+++ b/awx/ui/client/features/applications/list-applications.controller.js
@@ -78,7 +78,7 @@ function ListApplicationsController (
                     }
 
                     if (parseInt($state.params.application_id, 10) === app.id) {
-                        $state.go('^', reloadListStateParams, { reload: true });
+                        $state.go('applications', reloadListStateParams, { reload: true });
                     } else {
                         $state.go('.', reloadListStateParams, { reload: true });
                     }

From 4caa1451616f2017515a658649b66d46d7c918d1 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Thu, 10 May 2018 11:06:56 -0700
Subject: [PATCH 116/169] Removes prompt modal after clicking the action button
 on the copy prompt

---
 awx/ui/client/features/templates/templatesList.controller.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/awx/ui/client/features/templates/templatesList.controller.js b/awx/ui/client/features/templates/templatesList.controller.js
index 6ab8712e40..569bdc4b3a 100644
--- a/awx/ui/client/features/templates/templatesList.controller.js
+++ b/awx/ui/client/features/templates/templatesList.controller.js
@@ -211,6 +211,7 @@ function ListTemplatesController(
             .then(model => model.extend('get', 'copy'))
             .then(model => {
                 const action = () => {
+                    $('#prompt-modal').modal('hide');
                     Wait('start');
                     model.copy()
                         .then(({ id }) => {

From 8a2c3ce7165758b4e892b18f84c860e82f75377b Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 10 May 2018 14:13:13 -0400
Subject: [PATCH 117/169] add tokens to activity stream

---
 .../client/features/users/tokens/users-tokens-add.route.js   | 5 +++++
 .../client/features/users/tokens/users-tokens-list.route.js  | 5 +++++
 .../client/src/activity-stream/get-target-title.factory.js   | 3 +++
 .../streamDropdownNav/stream-dropdown-nav.directive.js       | 1 +
 awx/ui/client/src/bread-crumb/bread-crumb.directive.js       | 4 ++--
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/features/users/tokens/users-tokens-add.route.js b/awx/ui/client/features/users/tokens/users-tokens-add.route.js
index 350e9bd2dd..56effe1991 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-add.route.js
+++ b/awx/ui/client/features/users/tokens/users-tokens-add.route.js
@@ -21,6 +21,11 @@ export default {
     name: 'users.edit.tokens.add',
     params: {
     },
+    data: {
+        activityStream: true,
+        activityStreamTarget: 'o_auth2_access_token',
+        noActivityStreamID: true
+    },
     ncyBreadcrumb: {
         label: N_('CREATE TOKEN')
     },
diff --git a/awx/ui/client/features/users/tokens/users-tokens-list.route.js b/awx/ui/client/features/users/tokens/users-tokens-list.route.js
index c8a780e473..d262bbe944 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-list.route.js
+++ b/awx/ui/client/features/users/tokens/users-tokens-list.route.js
@@ -17,6 +17,11 @@ export default {
             controllerAs: 'vm'
         }
     },
+    data: {
+        activityStream: true,
+        activityStreamTarget: 'o_auth2_access_token',
+        noActivityStreamID: true
+    },
     searchPrefix: 'token',
     params: {
         token_search: {
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 88d274f58f..d895daa988 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
@@ -46,6 +46,9 @@ export default function GetTargetTitle(i18n) {
             case 'o_auth2_application':
                 rtnTitle = i18n._('APPLICATIONS');
                 break;
+            case 'o_auth2_access_token':
+                rtnTitle = i18n._('TOKENS');
+                break;
         }
 
         return rtnTitle;
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 e60170c310..e6b0ff87be 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
@@ -22,6 +22,7 @@ export default ['templateUrl', 'i18n', function(templateUrl, i18n) {
             $scope.options = [
                 {label: i18n._('All Activity'), value: 'dashboard'},
                 {label: i18n._('Applications'), value: 'o_auth2_application'},
+                {label: i18n._('Tokens'), value: 'o_auth2_access_token'},
                 {label: i18n._('Credentials'), value: 'credential'},
                 {label: i18n._('Hosts'), value: 'host'},
                 {label: i18n._('Inventories'), value: 'inventory'},
diff --git a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
index 41b7bc26ca..eeecf9e4c0 100644
--- a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
+++ b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
@@ -97,7 +97,7 @@ export default
                                     order_by: '-timestamp',
                                     page_size: '20',
                                 };
-                                if (streamConfig.activityStreamTarget && streamConfig.activityStreamId) {
+                                if (streamConfig.activityStreamTarget && streamConfig.activityStreamId && !streamConfig.noActivityStreamID) {
                                     stateGoParams.activity_search[streamConfig.activityStreamTarget] = $state.params[streamConfig.activityStreamId];
                                 }
                             }
@@ -107,7 +107,7 @@ export default
                                     page_size: '20',
                                 };
                             }
-                            if(streamConfig.activityStreamId) {
+                            if(streamConfig.activityStreamId && !streamConfig.noActivityStreamID) {
                                 stateGoParams.id = $state.params[streamConfig.activityStreamId];
                             }
                             if(stateGoParams.target === "custom_inventory_script"){

From 97614892c613c25b9235057fb7bdba9b5dd0a595 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 10 May 2018 14:17:38 -0400
Subject: [PATCH 118/169] fix syntax error in tokens list controller

---
 .../features/users/tokens/users-tokens-list.controller.js   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/features/users/tokens/users-tokens-list.controller.js b/awx/ui/client/features/users/tokens/users-tokens-list.controller.js
index fdeb821dcf..056a77792a 100644
--- a/awx/ui/client/features/users/tokens/users-tokens-list.controller.js
+++ b/awx/ui/client/features/users/tokens/users-tokens-list.controller.js
@@ -37,14 +37,16 @@ function ListTokensController (
         $scope[name] = dataset.results;
         vm.tokensCount = dataset.count;
     });
-    
+
     vm.getScopeString = str => {
         if (str === 'Read') {
             return vm.strings.get('add.SCOPE_READ_LABEL');
         } else if (str === 'Write') {
             return vm.strings.get('add.SCOPE_WRITE_LABEL');
         }
-    }
+
+        return undefined;
+    };
 
     vm.getLastUsed = token => {
         const lastUsed = _.get(token, 'last_used');

From db2a2fa5787944e2340b5f23013018ba19cef4b4 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 10 May 2018 14:44:23 -0400
Subject: [PATCH 119/169] update portal mode templates list to new style

---
 .../routes/portalModeTemplatesList.route.js   | 79 +++++++++++++++++++
 awx/ui/client/src/portal-mode/main.js         |  8 +-
 .../portal-mode/portal-job-templates.list.js  | 40 ----------
 .../portal-mode-job-templates.controller.js   | 15 ----
 .../portal-mode-layout.partial.html           | 13 ++-
 .../src/portal-mode/portal-mode.block.less    |  7 +-
 .../src/portal-mode/portal-mode.route.js      | 66 ----------------
 7 files changed, 98 insertions(+), 130 deletions(-)
 create mode 100644 awx/ui/client/features/templates/routes/portalModeTemplatesList.route.js
 delete mode 100644 awx/ui/client/src/portal-mode/portal-job-templates.list.js
 delete mode 100644 awx/ui/client/src/portal-mode/portal-mode-job-templates.controller.js
 delete mode 100644 awx/ui/client/src/portal-mode/portal-mode.route.js

diff --git a/awx/ui/client/features/templates/routes/portalModeTemplatesList.route.js b/awx/ui/client/features/templates/routes/portalModeTemplatesList.route.js
new file mode 100644
index 0000000000..55187b5a98
--- /dev/null
+++ b/awx/ui/client/features/templates/routes/portalModeTemplatesList.route.js
@@ -0,0 +1,79 @@
+import { templateUrl } from '../../../src/shared/template-url/template-url.factory';
+import { N_ } from '../../../src/i18n';
+import templatesListController from '../templatesList.controller';
+
+const templatesListTemplate = require('~features/templates/templatesList.view.html');
+
+export default {
+    name: 'portalMode',
+    url: '/portal',
+    reloadOnSearch: true,
+    ncyBreadcrumb: {
+        label: N_('MY VIEW')
+    },
+    data: {
+        socket: {
+            "groups": {
+                "jobs": ["status_changed"]
+            }
+        }
+    },
+    params: {
+        template_search: {
+            dynamic: true,
+            value: {
+                type: 'workflow_job_template,job_template',
+            },
+        }
+    },
+    searchPrefix: 'template',
+    views: {
+        '@': {
+            templateUrl: templateUrl('portal-mode/portal-mode-layout'),
+            controller: ['$scope', '$state',
+                function($scope, $state) {
+
+                    $scope.filterUser = function() {
+                        $state.go('portalMode.myJobs');
+                    };
+
+                    $scope.filterAll = function() {
+                        $state.go('portalMode.allJobs');
+                    };
+                }
+            ]
+        },
+        'templates@portalMode': {
+            templateUrl: templatesListTemplate,
+            controller: templatesListController,
+            controllerAs: 'vm'
+        }
+    },
+    resolve: {
+        resolvedModels: [
+            'JobTemplateModel',
+            'WorkflowJobTemplateModel',
+            (JobTemplate, WorkflowJobTemplate) => {
+                const models = [
+                    new JobTemplate(['options']),
+                    new WorkflowJobTemplate(['options']),
+                ];
+                return Promise.all(models);
+            },
+        ],
+        Dataset: [
+            '$stateParams',
+            'Wait',
+            'GetBasePath',
+            'QuerySet',
+            ($stateParams, Wait, GetBasePath, qs) => {
+                const searchParam = $stateParams.template_search;
+                const searchPath = GetBasePath('unified_job_templates');
+
+                Wait('start');
+                return qs.search(searchPath, searchParam)
+                    .finally(() => Wait('stop'));
+            }
+        ],
+    }
+};
diff --git a/awx/ui/client/src/portal-mode/main.js b/awx/ui/client/src/portal-mode/main.js
index e4e1dc2a2c..d74c97ddd9 100644
--- a/awx/ui/client/src/portal-mode/main.js
+++ b/awx/ui/client/src/portal-mode/main.js
@@ -4,16 +4,14 @@
  * All Rights Reserved
  *************************************************/
 
-import route from './portal-mode.route';
+// import route from './portal-mode.route';
+import templatesRoute from '~features/templates/routes/portalModeTemplatesList.route.js';
 import myJobsRoute from '~features/jobs/routes/portalModeMyJobs.route.js';
 import allJobsRoute from '~features/jobs/routes/portalModeAllJobs.route.js';
-import PortalJobTemplateList from './portal-job-templates.list';
-
 export default
  	angular.module('portalMode', [])
-    .factory('PortalJobTemplateList', PortalJobTemplateList)
  		.run(['$stateExtender', function($stateExtender){
- 			  $stateExtender.addState(route);
+        $stateExtender.addState(templatesRoute);
         $stateExtender.addState(myJobsRoute);
         $stateExtender.addState(allJobsRoute);
  		}]);
diff --git a/awx/ui/client/src/portal-mode/portal-job-templates.list.js b/awx/ui/client/src/portal-mode/portal-job-templates.list.js
deleted file mode 100644
index c966a2da3f..0000000000
--- a/awx/ui/client/src/portal-mode/portal-job-templates.list.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************
- * Copyright (c) 2015 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-
-export default ['i18n', function(i18n) {
-    return {
-
-        name: 'job_templates',
-        iterator: 'job_template',
-        editTitle: i18n._('JOB TEMPLATES'),
-        listTitle: i18n._('JOB TEMPLATES'),
-        index: false,
-        hover: true,
-        well: true,
-        emptyListText: i18n._('There are no job templates to display at this time'),
-        searchBarFullWidth: true,
-        fields: {
-            name: {
-                key: true,
-                label: i18n._('Name'),
-                columnClass: 'col-lg-5 col-md-5 col-sm-9 col-xs-8',
-                linkTo: '/#/templates/job_template/{{job_template.id}}',
-                awToolTip: '{{job_template.description | sanitize}}',
-                dataPlacement: 'top'
-            }
-        },
-
-        actions: {
-        },
-
-        fieldActions: {
-            submit: {
-                // uses the at-launch-template directive
-                launch: true
-            }
-        }
-    };}];
diff --git a/awx/ui/client/src/portal-mode/portal-mode-job-templates.controller.js b/awx/ui/client/src/portal-mode/portal-mode-job-templates.controller.js
deleted file mode 100644
index 14293871dc..0000000000
--- a/awx/ui/client/src/portal-mode/portal-mode-job-templates.controller.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*************************************************
- * Copyright (c) 2016 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-export function PortalModeJobTemplatesController($scope, PortalJobTemplateList, Dataset) {
-    var list = PortalJobTemplateList;
-    // search init
-    $scope.list = list;
-    $scope[`${list.iterator}_dataset`] = Dataset.data;
-    $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
-}
-
-PortalModeJobTemplatesController.$inject = ['$scope','PortalJobTemplateList', 'job_templatesDataset'];
diff --git a/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html b/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html
index d9eade91b0..417e97e1bc 100644
--- a/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html
+++ b/awx/ui/client/src/portal-mode/portal-mode-layout.partial.html
@@ -1,9 +1,18 @@
 <div class="tab-pane PortalMode">
     <div ng-cloak id="portal-landing">
         <div class="PortalMode-container">
-            <div ui-view="job-templates" class="PortalMode-panel--left Panel">
+            <div class="PortalMode-panel PortalMode-panel--left Panel">
+                <div id="portal-container-job-templates">
+                    <div class="List-header">
+                        <div class="List-title">
+                            <div class="List-titleText" translate>JOB TEMPLATES</div>
+                        </div>
+                    </div>
+                    <div ui-view="templates">
+                    </div>
+                </div>
             </div>
-            <div class="PortalMode-panel--right">
+            <div class="PortalMode-panel PortalMode-panel--right">
                 <div id="portal-container-jobs" class="Panel">
                     <div class="List-header">
                         <div class="List-title">
diff --git a/awx/ui/client/src/portal-mode/portal-mode.block.less b/awx/ui/client/src/portal-mode/portal-mode.block.less
index a75aa028ae..7a8fb934d8 100644
--- a/awx/ui/client/src/portal-mode/portal-mode.block.less
+++ b/awx/ui/client/src/portal-mode/portal-mode.block.less
@@ -10,20 +10,23 @@
 .PortalMode-panel--left{
 	.OnePlusOne-panel--left;
 }
+
 .PortalMode-panel--right{
 	.OnePlusOne-panel--right;
 	.List-tableHeader:last-of-type{
 		text-align:left;
 	}
+}
 
-    .List-header {
+.PortalMode-panel .List-header {
 		height: 14px;
 		margin-bottom: 20px;
-    }
 }
+
 .PortalMode-panelHeader{
 	.OnePlusOne-panelHeader;
 }
+
 .PortalMode-filterHolder {
 	position: absolute;
 	right: 1px;
diff --git a/awx/ui/client/src/portal-mode/portal-mode.route.js b/awx/ui/client/src/portal-mode/portal-mode.route.js
deleted file mode 100644
index 8812a489d6..0000000000
--- a/awx/ui/client/src/portal-mode/portal-mode.route.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { templateUrl } from '../shared/template-url/template-url.factory';
-import { PortalModeJobTemplatesController } from './portal-mode-job-templates.controller';
-import { N_ } from '../i18n';
-
-// Using multiple named views requires a parent layout
-// https://github.com/angular-ui/ui-router/wiki/Multiple-Named-Views
-export default {
-    name: 'portalMode',
-    url: '/portal?{job_template_search:queryset}',
-    reloadOnSearch: true,
-    ncyBreadcrumb: {
-        label: N_('MY VIEW')
-    },
-    params: {
-        job_template_search: {
-            value: {
-                page_size: '20',
-                order_by: 'name'
-            },
-            dynamic: true
-        }
-    },
-    data: {
-        socket: {
-            "groups": {
-                "jobs": ["status_changed"]
-            }
-        }
-    },
-    views: {
-        '@': {
-            templateUrl: templateUrl('portal-mode/portal-mode-layout'),
-            controller: ['$scope', '$state',
-                function($scope, $state) {
-
-                    $scope.filterUser = function() {
-                        $state.go('portalMode.myJobs');
-                    };
-
-                    $scope.filterAll = function() {
-                        $state.go('portalMode.allJobs');
-                    };
-                }
-            ]
-        },
-        // named ui-views inside the above
-        'job-templates@portalMode': {
-            templateProvider: function(PortalJobTemplateList, generateList) {
-                let html = generateList.build({
-                    list: PortalJobTemplateList,
-                    mode: 'edit'
-                });
-                return html + '<prompt prompt-data="promptData" on-finish="launchJob()"></prompt>';
-            },
-            controller: PortalModeJobTemplatesController
-        }
-    },
-    resolve: {
-        job_templatesDataset: ['PortalJobTemplateList', 'QuerySet', '$stateParams', 'GetBasePath',
-            function(list, qs, $stateParams, GetBasePath) {
-                let path = GetBasePath(list.basePath) || GetBasePath(list.name);
-                return qs.search(path, $stateParams[`${list.iterator}_search`]);
-            }
-        ]
-    }
-};

From 576a4a1b58321fefda36493730231459f80bb2a1 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Thu, 10 May 2018 13:04:26 -0700
Subject: [PATCH 120/169] removes extra slash

---
 awx/ui/client/src/scheduler/editSchedule.resolve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/scheduler/editSchedule.resolve.js b/awx/ui/client/src/scheduler/editSchedule.resolve.js
index 8c20f833b6..9d6e777896 100644
--- a/awx/ui/client/src/scheduler/editSchedule.resolve.js
+++ b/awx/ui/client/src/scheduler/editSchedule.resolve.js
@@ -19,7 +19,7 @@ function editScheduleResolve () {
         ],
         timezonesResolve: ['Rest', '$stateParams', 'GetBasePath', 'ProcessErrors',
             (Rest, $stateParams, GetBasePath, ProcessErrors) => {
-                var path = `${GetBasePath('schedules')}/zoneinfo`;
+                var path = `${GetBasePath('schedules')}zoneinfo`;
                 Rest.setUrl(path);
                 return Rest.get()
                     .then(function(data) {

From b79606d9d365fd63b5340ae9ad1aff75300db566 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Fri, 11 May 2018 09:41:21 -0400
Subject: [PATCH 121/169] update project if certain params changed

---
 awx/main/models/projects.py                   | 21 +++++++++++-
 .../tests/functional/models/test_project.py   | 33 +++++++++++++++++++
 .../task_management/test_scheduler.py         |  2 +-
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 awx/main/tests/functional/models/test_project.py

diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py
index d99fe5bafb..3bad19c8eb 100644
--- a/awx/main/models/projects.py
+++ b/awx/main/models/projects.py
@@ -241,6 +241,7 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEn
     SOFT_UNIQUE_TOGETHER = [('polymorphic_ctype', 'name', 'organization')]
     FIELDS_TO_PRESERVE_AT_COPY = ['labels', 'instance_groups', 'credentials']
     FIELDS_TO_DISCARD_AT_COPY = ['local_path']
+    FIELDS_TRIGGER_UPDATE = frozenset(['scm_url', 'scm_branch', 'scm_type'])
 
     class Meta:
         app_label = 'main'
@@ -323,6 +324,11 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEn
             ['name', 'description', 'schedule']
         )
 
+    def __init__(self, *args, **kwargs):
+        r = super(Project, self).__init__(*args, **kwargs)
+        self._prior_values_store = self._current_sensitive_fields()
+        return r
+
     def save(self, *args, **kwargs):
         new_instance = not bool(self.pk)
         # If update_fields has been specified, add our field names to it,
@@ -354,9 +360,22 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEn
                 with disable_activity_stream():
                     self.save(update_fields=update_fields)
         # If we just created a new project with SCM, start the initial update.
-        if new_instance and self.scm_type and not skip_update:
+        # also update if certain fields have changed
+        relevant_change = False
+        new_values = self._current_sensitive_fields()
+        if hasattr(self, '_prior_values_store') and self._prior_values_store != new_values:
+            relevant_change = True
+        self._prior_values_store = new_values
+        if (relevant_change or new_instance) and (not skip_update) and self.scm_type:
             self.update()
 
+    def _current_sensitive_fields(self):
+        new_values = {}
+        for attr, val in self.__dict__.items():
+            if attr in Project.FIELDS_TRIGGER_UPDATE:
+                new_values[attr] = val
+        return new_values
+
     def _get_current_status(self):
         if self.scm_type:
             if self.current_job and self.current_job.status:
diff --git a/awx/main/tests/functional/models/test_project.py b/awx/main/tests/functional/models/test_project.py
new file mode 100644
index 0000000000..71352ed633
--- /dev/null
+++ b/awx/main/tests/functional/models/test_project.py
@@ -0,0 +1,33 @@
+import pytest
+import mock
+
+from awx.main.models import Project
+
+
+@pytest.mark.django_db
+def test_project_initial_update():
+    with mock.patch.object(Project, "update") as mock_update:
+        Project.objects.create(name='foo', scm_type='git')
+    mock_update.assert_called_once_with()
+
+
+@pytest.mark.django_db
+def test_does_not_update_nonsensitive_change(project):
+    with mock.patch.object(Project, "update") as mock_update:
+        project.scm_update_on_launch = not project.scm_update_on_launch
+        project.save()
+    mock_update.assert_not_called()
+
+
+@pytest.mark.django_db
+def test_sensitive_change_triggers_update(project):
+    with mock.patch.object(Project, "update") as mock_update:
+        project.scm_url = 'https://foo.invalid'
+        project.save()
+    mock_update.assert_called_once_with()
+    # test other means of initialization
+    project = Project.objects.get(pk=project.pk)
+    with mock.patch.object(Project, "update") as mock_update:
+        project.scm_url = 'https://foo2.invalid'
+        project.save()
+    mock_update.assert_called_once_with()
diff --git a/awx/main/tests/functional/task_management/test_scheduler.py b/awx/main/tests/functional/task_management/test_scheduler.py
index 1d87417b17..116deba3ad 100644
--- a/awx/main/tests/functional/task_management/test_scheduler.py
+++ b/awx/main/tests/functional/task_management/test_scheduler.py
@@ -113,7 +113,7 @@ def test_single_job_dependencies_project_launch(default_instance_group, job_temp
     p.scm_update_cache_timeout = 0
     p.scm_type = "git"
     p.scm_url = "http://github.com/ansible/ansible.git"
-    p.save()
+    p.save(skip_update=True)
     with mock.patch("awx.main.scheduler.TaskManager.start_task"):
         tm = TaskManager()
         with mock.patch.object(TaskManager, "create_project_update", wraps=tm.create_project_update) as mock_pu:

From e9348134f0eab344af1ef2c4a1d631b8e3d7c85f Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Fri, 11 May 2018 16:38:04 -0400
Subject: [PATCH 122/169] Fixed credentials form checkbox styling

---
 awx/ui/client/lib/components/input/_index.less | 2 --
 1 file changed, 2 deletions(-)

diff --git a/awx/ui/client/lib/components/input/_index.less b/awx/ui/client/lib/components/input/_index.less
index adcc2f2505..4867ea2242 100644
--- a/awx/ui/client/lib/components/input/_index.less
+++ b/awx/ui/client/lib/components/input/_index.less
@@ -152,8 +152,6 @@
 
     & > input[type=checkbox] {
         margin: 0 3px 0 0;
-        position: relative;
-        top: 3px
     }
 
     & > p {

From 464b7c3775f8b05cde4cc9e1169689846fd274c4 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Thu, 10 May 2018 16:31:44 -0700
Subject: [PATCH 123/169] Moves schedules to related tab for job templates

---
 .../client/features/templates/index.view.html |   1 +
 .../templates/templatesList.controller.js     |   2 +-
 .../organizations-job-templates.controller.js |   2 +-
 awx/ui/client/src/scheduler/main.js           |  94 +---------------
 .../src/scheduler/schedulerAdd.controller.js  |   2 +-
 .../src/scheduler/schedulerEdit.controller.js |   4 +-
 .../src/scheduler/schedulerList.controller.js |   4 +-
 .../client/src/scheduler/schedules.route.js   | 100 ++++++++++++++++++
 .../job_templates/job-template.form.js        |   5 +
 awx/ui/client/src/templates/main.js           |  10 +-
 10 files changed, 123 insertions(+), 101 deletions(-)
 create mode 100644 awx/ui/client/src/scheduler/schedules.route.js

diff --git a/awx/ui/client/features/templates/index.view.html b/awx/ui/client/features/templates/index.view.html
index 5f6ae703f6..346ab0c0f1 100644
--- a/awx/ui/client/features/templates/index.view.html
+++ b/awx/ui/client/features/templates/index.view.html
@@ -1,3 +1,4 @@
+<div ui-view="scheduler"></div>
 <div ui-view="form"></div>
 <at-panel ng-cloak id="htmlTemplate">
     <div ng-if="$state.is('templates')">
diff --git a/awx/ui/client/features/templates/templatesList.controller.js b/awx/ui/client/features/templates/templatesList.controller.js
index 569bdc4b3a..c2d43caed5 100644
--- a/awx/ui/client/features/templates/templatesList.controller.js
+++ b/awx/ui/client/features/templates/templatesList.controller.js
@@ -98,7 +98,7 @@ function ListTemplatesController(
         }
 
         if (isJobTemplate(template)) {
-            $state.go('jobTemplateSchedules', { id: template.id });
+            $state.go('templates.editJobTemplate.schedules', { job_template_id: template.id });
         } else if (isWorkflowTemplate(template)) {
             $state.go('workflowJobTemplateSchedules', { id: template.id });
         } else {
diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
index 2d5e0eab40..8c58157ab3 100644
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
@@ -74,7 +74,7 @@ export default ['$scope', '$rootScope',
         };
 
         $scope.scheduleJob = function(id) {
-            $state.go('jobTemplateSchedules', { id: id });
+            $state.go('templates.editJobTemplate.schedules', { id: id });
         };
 
         // $scope.copyTemplate = function(id) {
diff --git a/awx/ui/client/src/scheduler/main.js b/awx/ui/client/src/scheduler/main.js
index b20b77b349..fac66d2da3 100644
--- a/awx/ui/client/src/scheduler/main.js
+++ b/awx/ui/client/src/scheduler/main.js
@@ -33,99 +33,7 @@ export default
         .run(['$stateExtender', function($stateExtender) {
             // Inventory sync schedule states registered in: awx/ui/client/src/inventories/manage/groups/main.js
             // Scheduled jobs states registered in awx/uiclient/src/job-detail/main.js
-
-            // job templates
-            $stateExtender.addState({
-                searchPrefix: 'schedule',
-                name: 'jobTemplateSchedules',
-                route: '/templates/job_template/:id/schedules',
-                data: {
-                    activityStream: true,
-                    activityStreamTarget: 'job_template',
-                    activityStreamId: 'id'
-                },
-                // ncyBreadcrumb: {
-                //     parent: 'templates.editJobTemplate({job_template_id: parentObject.id})',
-                //     label: N_('SCHEDULES')
-                // },
-                resolve: {
-                    Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath',
-                        function(list, qs, $stateParams, GetBasePath) {
-                            let path = `${GetBasePath('job_templates')}${$stateParams.id}/schedules`;
-                            return qs.search(path, $stateParams[`${list.iterator}_search`]);
-                        }
-                    ],
-                    ParentObject: ['$stateParams', 'Rest', 'GetBasePath', function($stateParams, Rest, GetBasePath){
-                        let path = `${GetBasePath('job_templates')}${$stateParams.id}`;
-                        Rest.setUrl(path);
-                        return Rest.get(path).then(response => response.data);
-                    }],
-                    UnifiedJobsOptions: ['Rest', 'GetBasePath', '$stateParams', '$q',
-                        function(Rest, GetBasePath, $stateParams, $q) {
-                            Rest.setUrl(GetBasePath('unified_jobs'));
-                            var val = $q.defer();
-                            Rest.options()
-                                .then(function(data) {
-                                    val.resolve(data.data);
-                                }, function(data) {
-                                    val.reject(data);
-                                });
-                            return val.promise;
-                        }],
-                    ScheduleList: ['SchedulesList', 'GetBasePath', '$stateParams',
-                        (SchedulesList, GetBasePath, $stateParams) => {
-                            let list = _.cloneDeep(SchedulesList);
-                            list.basePath = GetBasePath('job_templates') + $stateParams.id + '/schedules/';
-                            return list;
-                        }
-                    ]
-                },
-                views: {
-                    '@': {
-                        templateProvider: function(ScheduleList, generateList, ParentObject, $filter){
-                            // include name of parent resource in listTitle
-                            ScheduleList.listTitle = `${$filter('sanitize')(ParentObject.name)}<div class='List-titleLockup'></div>` + N_('SCHEDULES');
-                            let html = generateList.build({
-                                list: ScheduleList,
-                                mode: 'edit'
-                            });
-                            html = generateList.wrapPanel(html);
-                            return generateList.insertFormView() + html;
-                        },
-                        controller: 'schedulerListController'
-                    }
-                }
-            });
-            $stateExtender.addState({
-                name: 'jobTemplateSchedules.add',
-                route: '/add',
-                views: {
-                    'form': {
-                        controller: 'schedulerAddController',
-                        templateUrl: templateUrl("scheduler/schedulerForm"),
-                    }
-                },
-                ncyBreadcrumb: {
-                    parent: 'jobTemplateSchedules',
-                    label: N_('CREATE SCHEDULE')
-                }
-            });
-            $stateExtender.addState({
-                name: 'jobTemplateSchedules.edit',
-                route: '/:schedule_id',
-                views: {
-                    'form': {
-                        controller: 'schedulerEditController',
-                        templateUrl: templateUrl("scheduler/schedulerForm"),
-                    }
-                },
-                ncyBreadcrumb: {
-                    parent: 'jobTemplateSchedules',
-                    label: '{{schedule_obj.name}}'
-                },
-                resolve: editScheduleResolve()
-            });
-
+            
             // workflows
             $stateExtender.addState({
                 searchPrefix: 'schedule',
diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
index d312083bd2..5e1de11991 100644
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@@ -90,7 +90,7 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
     $scope.hideForm = true;
 
     // extra_data field is not manifested in the UI when scheduling a Management Job
-    if ($state.current.name === 'jobTemplateSchedules.add'){
+    if ($state.current.name === 'templates.editJobTemplate.schedules.add'){
         $scope.parseType = 'yaml';
 
         let jobTemplate = new JobTemplate();
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index e247a22322..e3f9d13ec4 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -132,7 +132,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
 
     // sets the UNTIL portion of the schedule form after the angular-scheduler
     // sets it, but this function reads the 'until' key/value pair directly
-    // from the schedule GET response. 
+    // from the schedule GET response.
     function setUntil (scheduler) {
         let { until } = scheduleResolve;
         if(until !== ''){
@@ -229,7 +229,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
             $scope.schedulerPurgeDays = Number(schedule.extra_data.days);
         }
 
-        if ($state.current.name === 'jobTemplateSchedules.edit'){
+        if ($state.current.name === 'templates.editJobTemplate.schedules.edit'){
 
             let jobTemplate = new JobTemplate();
 
diff --git a/awx/ui/client/src/scheduler/schedulerList.controller.js b/awx/ui/client/src/scheduler/schedulerList.controller.js
index 3ae664216a..36fab4d9c7 100644
--- a/awx/ui/client/src/scheduler/schedulerList.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerList.controller.js
@@ -137,7 +137,7 @@ export default [
             if($state.current.name.endsWith('.edit')) {
                 $state.go('^.add');
             }
-            else if(!$state.current.name.endsWith('.add')) {
+            if(!$state.current.name.endsWith('.add')) {
                 $state.go('.add');
             }
         };
@@ -165,7 +165,7 @@ export default [
                 switch(schedule.summary_fields.unified_job_template.unified_job_type){
                 case 'job':
                     deferred.resolve({
-                        name: 'jobTemplateSchedules.edit',
+                        name: 'templates.editJobTemplate.schedules.edit',
                         params: {
                             id: schedule.unified_job_template,
                             schedule_id: schedule.id
diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js
new file mode 100644
index 0000000000..35513676da
--- /dev/null
+++ b/awx/ui/client/src/scheduler/schedules.route.js
@@ -0,0 +1,100 @@
+import { N_ } from '../i18n';
+import {templateUrl} from '../shared/template-url/template-url.factory';
+import editScheduleResolve from './editSchedule.resolve';
+
+const jobTemplatesSchedulesListRoute = {
+    searchPrefix: 'schedule',
+    name: 'templates.editJobTemplate.schedules',
+    route: '/schedules',
+    data: {
+        activityStream: true,
+        activityStreamTarget: 'job_template',
+        activityStreamId: 'id'
+    },
+    ncyBreadcrumb: {
+        parent: 'templates.editJobTemplate({job_template_id: parentObject.id})',
+        label: N_('SCHEDULES')
+    },
+    resolve: {
+        Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath',
+            function(list, qs, $stateParams, GetBasePath) {
+                let path = `${GetBasePath('job_templates')}${$stateParams.job_template_id}/schedules`;
+                return qs.search(path, $stateParams[`${list.iterator}_search`]);
+            }
+        ],
+        ParentObject: ['$stateParams', 'Rest', 'GetBasePath', function($stateParams, Rest, GetBasePath){
+            let path = `${GetBasePath('job_templates')}${$stateParams.job_template_id}`;
+            Rest.setUrl(path);
+            return Rest.get(path).then(response => response.data);
+        }],
+        UnifiedJobsOptions: ['Rest', 'GetBasePath', '$q',
+            function(Rest, GetBasePath, $q) {
+                Rest.setUrl(GetBasePath('unified_jobs'));
+                var val = $q.defer();
+                Rest.options()
+                    .then(function(data) {
+                        val.resolve(data.data);
+                    }, function(data) {
+                        val.reject(data);
+                    });
+                return val.promise;
+            }],
+        ScheduleList: ['SchedulesList', 'GetBasePath', '$stateParams',
+            (SchedulesList, GetBasePath, $stateParams) => {
+                let list = _.cloneDeep(SchedulesList);
+                list.basePath = GetBasePath('job_templates') + $stateParams.job_template_id + '/schedules/';
+                return list;
+            }
+        ]
+    },
+    views: {
+        related: {
+            templateProvider: function(ScheduleList, generateList, ParentObject, $filter){
+                ScheduleList.title = false;
+                let html = generateList.build({
+                    list: ScheduleList,
+                    mode: 'edit'
+                });
+                return html;
+            },
+            controller: 'schedulerListController'
+        }
+    }
+};
+
+const jobTemplatesSchedulesAddRoute = {
+    name: 'templates.editJobTemplate.schedules.add',
+    route: '/add',
+    views: {
+        'scheduler@templates': {
+            controller: 'schedulerAddController',
+            templateUrl: templateUrl("scheduler/schedulerForm"),
+        }
+    },
+    ncyBreadcrumb: {
+        parent: 'templates.editJobTemplate({job_template_id: parentObject.id})',
+        label: N_('CREATE SCHEDULE')
+    }
+};
+
+const jobTemplatesSchedulesEditRoute = {
+    name: 'templates.editJobTemplate.schedules.edit',
+    route: '/:schedule_id',
+    views: {
+        'scheduler@templates': {
+            controller: 'schedulerEditController',
+            templateUrl: templateUrl("scheduler/schedulerForm"),
+        }
+    },
+    ncyBreadcrumb: {
+        parent: 'templates.editJobTemplate({job_template_id: parentObject.id})',
+        label: '{{schedule_obj.name}}'
+    },
+    resolve: editScheduleResolve()
+};
+
+export {
+    jobTemplatesSchedulesListRoute,
+    jobTemplatesSchedulesAddRoute,
+    jobTemplatesSchedulesEditRoute
+};
diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js
index 31174ac043..7d1ce6090a 100644
--- a/awx/ui/client/src/templates/job_templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job_templates/job-template.form.js
@@ -438,6 +438,11 @@ function(NotificationsList, i18n) {
                     title: i18n._('Completed Jobs'),
                     skipGenerator: true,
                     ngClick: "$state.go('templates.editJobTemplate.completed_jobs')"
+                },
+                "schedules": {
+                    title: i18n._('Schedules'),
+                    skipGenerator: true,
+                    ngClick: "$state.go('templates.editJobTemplate.schedules')"
                 }
             },
 
diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js
index ac0c5036a0..8196cf527d 100644
--- a/awx/ui/client/src/templates/main.js
+++ b/awx/ui/client/src/templates/main.js
@@ -21,6 +21,11 @@ import TemplateList from './templates.list';
 import listRoute from '~features/templates/routes/templatesList.route.js';
 import templateCompletedJobsRoute from '~features/jobs/routes/templateCompletedJobs.route.js';
 import workflowJobTemplateCompletedJobsRoute from '~features/jobs/routes/workflowJobTemplateCompletedJobs.route.js';
+import {
+    jobTemplatesSchedulesListRoute,
+    jobTemplatesSchedulesAddRoute,
+    jobTemplatesSchedulesEditRoute
+} from '../scheduler/schedules.route';
 
 export default
 angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, prompt.name, workflowAdd.name, workflowEdit.name,
@@ -748,7 +753,10 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
                             stateExtender.buildDefinition(listRoute),
                             stateExtender.buildDefinition(templateCompletedJobsRoute),
                             stateExtender.buildDefinition(workflowJobTemplateCompletedJobsRoute),
-                            stateExtender.buildDefinition(workflowMaker)
+                            stateExtender.buildDefinition(workflowMaker),
+                            stateExtender.buildDefinition(jobTemplatesSchedulesListRoute),
+                            stateExtender.buildDefinition(jobTemplatesSchedulesAddRoute),
+                            stateExtender.buildDefinition(jobTemplatesSchedulesEditRoute)
                         ])
                     };
                 });

From 13d58107b8700738ede0d9a08e78f71e892b305c Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Fri, 11 May 2018 10:51:55 -0700
Subject: [PATCH 124/169] Moves scheduler to related tab for workflows

and updates all links to point to updated state
---
 .../templates/templatesList.controller.js     |  2 +-
 awx/ui/client/src/scheduler/main.js           | 94 +-----------------
 .../src/scheduler/schedulerAdd.controller.js  |  4 +-
 .../src/scheduler/schedulerEdit.controller.js |  4 +-
 .../src/scheduler/schedulerList.controller.js |  6 +-
 .../client/src/scheduler/schedules.route.js   | 97 ++++++++++++++++++-
 awx/ui/client/src/templates/main.js           | 10 +-
 awx/ui/client/src/templates/workflows.form.js |  5 +
 8 files changed, 119 insertions(+), 103 deletions(-)

diff --git a/awx/ui/client/features/templates/templatesList.controller.js b/awx/ui/client/features/templates/templatesList.controller.js
index c2d43caed5..5ad7388fd4 100644
--- a/awx/ui/client/features/templates/templatesList.controller.js
+++ b/awx/ui/client/features/templates/templatesList.controller.js
@@ -100,7 +100,7 @@ function ListTemplatesController(
         if (isJobTemplate(template)) {
             $state.go('templates.editJobTemplate.schedules', { job_template_id: template.id });
         } else if (isWorkflowTemplate(template)) {
-            $state.go('workflowJobTemplateSchedules', { id: template.id });
+            $state.go('templates.editWorkflowJobTemplate.schedules', { workflow_job_template_id: template.id });
         } else {
             Alert(strings.get('error.UNKNOWN'), strings.get('alert.UNKNOWN_SCHEDULE'));
         }
diff --git a/awx/ui/client/src/scheduler/main.js b/awx/ui/client/src/scheduler/main.js
index fac66d2da3..76f3b91ad8 100644
--- a/awx/ui/client/src/scheduler/main.js
+++ b/awx/ui/client/src/scheduler/main.js
@@ -33,98 +33,8 @@ export default
         .run(['$stateExtender', function($stateExtender) {
             // Inventory sync schedule states registered in: awx/ui/client/src/inventories/manage/groups/main.js
             // Scheduled jobs states registered in awx/uiclient/src/job-detail/main.js
-            
-            // workflows
-            $stateExtender.addState({
-                searchPrefix: 'schedule',
-                name: 'workflowJobTemplateSchedules',
-                route: '/templates/workflow_job_template/:id/schedules',
-                data: {
-                    activityStream: true,
-                    activityStreamTarget: 'job_template',
-                    activityStreamId: 'id'
-                },
-                ncyBreadcrumb: {
-                    parent: 'templates.editWorkflowJobTemplate({workflow_job_template_id: parentObject.id})',
-                    label: N_('SCHEDULES')
-                },
-                resolve: {
-                    Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath',
-                        function(list, qs, $stateParams, GetBasePath) {
-                            let path = `${GetBasePath('workflow_job_templates')}${$stateParams.id}/schedules`;
-                            return qs.search(path, $stateParams[`${list.iterator}_search`]);
-                        }
-                    ],
-                    ParentObject: ['$stateParams', 'Rest', 'GetBasePath', function($stateParams, Rest, GetBasePath){
-                        let path = `${GetBasePath('workflow_job_templates')}${$stateParams.id}`;
-                        Rest.setUrl(path);
-                        return Rest.get(path).then(response => response.data);
-                    }],
-                    UnifiedJobsOptions: ['Rest', 'GetBasePath', '$stateParams', '$q',
-                        function(Rest, GetBasePath, $stateParams, $q) {
-                            Rest.setUrl(GetBasePath('unified_jobs'));
-                            var val = $q.defer();
-                            Rest.options()
-                                .then(function(data) {
-                                    val.resolve(data.data);
-                                }, function(data) {
-                                    val.reject(data);
-                                });
-                            return val.promise;
-                        }],
-                    ScheduleList: ['SchedulesList', 'GetBasePath', '$stateParams',
-                        (SchedulesList, GetBasePath, $stateParams) => {
-                            let list = _.cloneDeep(SchedulesList);
-                            list.basePath = GetBasePath('workflow_job_templates') + $stateParams.id + '/schedules/';
-                            return list;
-                        }
-                    ]
-                },
-                views: {
-                    '@': {
-                        templateProvider: function(ScheduleList, generateList, ParentObject, $filter){
-                            // include name of parent resource in listTitle
-                            ScheduleList.listTitle = `${$filter('sanitize')(ParentObject.name)}<div class='List-titleLockup'></div>` + N_('SCHEDULES');
-                            let html = generateList.build({
-                                list: ScheduleList,
-                                mode: 'edit'
-                            });
-                            html = generateList.wrapPanel(html);
-                            return generateList.insertFormView() + html;
-                        },
-                        controller: 'schedulerListController'
-                    }
-                }
-            });
-            $stateExtender.addState({
-                name: 'workflowJobTemplateSchedules.add',
-                route: '/add',
-                views: {
-                    'form': {
-                        controller: 'schedulerAddController',
-                        templateUrl: templateUrl("scheduler/schedulerForm"),
-                    }
-                },
-                ncyBreadcrumb: {
-                    parent: 'workflowJobTemplateSchedules',
-                    label: N_('CREATE SCHEDULE')
-                }
-            });
-            $stateExtender.addState({
-                name: 'workflowJobTemplateSchedules.edit',
-                route: '/:schedule_id',
-                views: {
-                    'form': {
-                        controller: 'schedulerEditController',
-                        templateUrl: templateUrl("scheduler/schedulerForm"),
-                    }
-                },
-                ncyBreadcrumb: {
-                    parent: 'workflowJobTemplateSchedules',
-                    label: '{{schedule_obj.name}}'
-                },
-                resolve: editScheduleResolve()
-            });
+
+        
             // projects
             $stateExtender.addState({
                 searchPrefix: 'schedule',
diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
index 5e1de11991..e8ac324962 100644
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@@ -206,7 +206,7 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
                     }
                 }
             });
-    } else if ($state.current.name === 'workflowJobTemplateSchedules.add'){
+    } else if ($state.current.name === 'templates.editWorkflowJobTemplate.schedules.add'){
         let workflowJobTemplate = new WorkflowJobTemplate();
 
         $q.all([workflowJobTemplate.optionsLaunch(ParentObject.id), workflowJobTemplate.getLaunch(ParentObject.id)])
@@ -276,7 +276,7 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
             });
     }
 
-    if ($state.current.name === 'workflowJobTemplateSchedules.add' ||
+    if ($state.current.name === 'templates.editWorkflowJobTemplate.schedules.add' ||
         $state.current.name === 'projectSchedules.add' ||
         $state.current.name === 'inventories.edit.inventory_sources.edit.schedules.add'
     ){
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index e3f9d13ec4..f7441e0f7f 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -378,7 +378,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
                         }
                     }
                 });
-        } else if ($state.current.name === 'workflowJobTemplateSchedules.edit') {
+        } else if ($state.current.name === 'templates.editWorkflowJobTemplate.schedules.edit') {
             let workflowJobTemplate = new WorkflowJobTemplate();
 
             $q.all([workflowJobTemplate.optionsLaunch(ParentObject.id), workflowJobTemplate.getLaunch(ParentObject.id)])
@@ -453,7 +453,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
         if ($state.current.name !== 'managementJobsList.schedule.add' && $state.current.name !== 'managementJobsList.schedule.edit'){
             if ($state.current.name === 'projectSchedules.edit' ||
                 $state.current.name === 'inventories.edit.inventory_sources.edit.schedules.edit' ||
-                $state.current.name === 'workflowJobTemplateSchedules.add'
+                $state.current.name === 'templates.editWorkflowJobTemplate.schedules.add'
             ){
                 $scope.noVars = true;
             } else {
diff --git a/awx/ui/client/src/scheduler/schedulerList.controller.js b/awx/ui/client/src/scheduler/schedulerList.controller.js
index 36fab4d9c7..ab4198f3aa 100644
--- a/awx/ui/client/src/scheduler/schedulerList.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerList.controller.js
@@ -167,7 +167,7 @@ export default [
                     deferred.resolve({
                         name: 'templates.editJobTemplate.schedules.edit',
                         params: {
-                            id: schedule.unified_job_template,
+                            job_template_id: schedule.unified_job_template,
                             schedule_id: schedule.id
                         }
                     });
@@ -175,9 +175,9 @@ export default [
 
                     case 'workflow_job':
                         deferred.resolve({
-                            name: 'workflowJobTemplateSchedules.edit',
+                            name: 'templates.editWorkflowJobTemplate.schedules.edit',
                             params: {
-                                id: schedule.unified_job_template,
+                                workflow_job_template_id: schedule.unified_job_template,
                                 schedule_id: schedule.id
                             }
                         });
diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js
index 35513676da..2f54060d9f 100644
--- a/awx/ui/client/src/scheduler/schedules.route.js
+++ b/awx/ui/client/src/scheduler/schedules.route.js
@@ -93,8 +93,103 @@ const jobTemplatesSchedulesEditRoute = {
     resolve: editScheduleResolve()
 };
 
+// workflows
+const workflowSchedulesRoute = {
+    searchPrefix: 'schedule',
+    name: 'templates.editWorkflowJobTemplate.schedules',
+    route: '/schedules',
+    data: {
+        activityStream: true,
+        activityStreamTarget: 'job_template',
+        activityStreamId: 'id'
+    },
+    ncyBreadcrumb: {
+        parent: 'templates.editWorkflowJobTemplate({workflow_job_template_id: parentObject.id})',
+        label: N_('SCHEDULES')
+    },
+    resolve: {
+        Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath',
+            function(list, qs, $stateParams, GetBasePath) {
+                let path = `${GetBasePath('workflow_job_templates')}${$stateParams.workflow_job_template_id}/schedules`;
+                return qs.search(path, $stateParams[`${list.iterator}_search`]);
+            }
+        ],
+        ParentObject: ['$stateParams', 'Rest', 'GetBasePath', function($stateParams, Rest, GetBasePath){
+            let path = `${GetBasePath('workflow_job_templates')}${$stateParams.workflow_job_template_id}`;
+            Rest.setUrl(path);
+            return Rest.get(path).then(response => response.data);
+        }],
+        UnifiedJobsOptions: ['Rest', 'GetBasePath', '$stateParams', '$q',
+            function(Rest, GetBasePath, $stateParams, $q) {
+                Rest.setUrl(GetBasePath('unified_jobs'));
+                var val = $q.defer();
+                Rest.options()
+                    .then(function(data) {
+                        val.resolve(data.data);
+                    }, function(data) {
+                        val.reject(data);
+                    });
+                return val.promise;
+            }],
+        ScheduleList: ['SchedulesList', 'GetBasePath', '$stateParams',
+            (SchedulesList, GetBasePath, $stateParams) => {
+                let list = _.cloneDeep(SchedulesList);
+                list.basePath = GetBasePath('workflow_job_templates') + $stateParams.workflow_job_template_id + '/schedules/';
+                return list;
+            }
+        ]
+    },
+    views: {
+        related: {
+            templateProvider: function(ScheduleList, generateList, ParentObject, $filter){
+                ScheduleList.title = false;
+                let html = generateList.build({
+                    list: ScheduleList,
+                    mode: 'edit'
+                });
+                return html;
+            },
+            controller: 'schedulerListController'
+        }
+    }
+};
+
+const workflowSchedulesAddRoute = {
+    name: 'templates.editWorkflowJobTemplate.schedules.add',
+    route: '/add',
+    views: {
+        'scheduler@templates': {
+            controller: 'schedulerAddController',
+            templateUrl: templateUrl("scheduler/schedulerForm"),
+        }
+    },
+    ncyBreadcrumb: {
+        parent: 'templates.editWorkflowJobTemplate({workflow_job_template_id: parentObject.id})',
+        label: N_('CREATE SCHEDULE')
+    }
+};
+
+const workflowSchedulesEditRoute = {
+    name: 'templates.editWorkflowJobTemplate.schedules.edit',
+    route: '/:schedule_id',
+    views: {
+        'scheduler@templates': {
+            controller: 'schedulerEditController',
+            templateUrl: templateUrl("scheduler/schedulerForm"),
+        }
+    },
+    ncyBreadcrumb: {
+        parent: 'templates.editWorkflowJobTemplate({workflow_job_template_id: parentObject.id})',
+        label: '{{schedule_obj.name}}'
+    },
+    resolve: editScheduleResolve()
+};
+
 export {
     jobTemplatesSchedulesListRoute,
     jobTemplatesSchedulesAddRoute,
-    jobTemplatesSchedulesEditRoute
+    jobTemplatesSchedulesEditRoute,
+    workflowSchedulesRoute,
+    workflowSchedulesAddRoute,
+    workflowSchedulesEditRoute
 };
diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js
index 8196cf527d..7b05bde077 100644
--- a/awx/ui/client/src/templates/main.js
+++ b/awx/ui/client/src/templates/main.js
@@ -24,7 +24,10 @@ import workflowJobTemplateCompletedJobsRoute from '~features/jobs/routes/workflo
 import {
     jobTemplatesSchedulesListRoute,
     jobTemplatesSchedulesAddRoute,
-    jobTemplatesSchedulesEditRoute
+    jobTemplatesSchedulesEditRoute,
+    workflowSchedulesRoute,
+    workflowSchedulesAddRoute,
+    workflowSchedulesEditRoute
 } from '../scheduler/schedules.route';
 
 export default
@@ -756,7 +759,10 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
                             stateExtender.buildDefinition(workflowMaker),
                             stateExtender.buildDefinition(jobTemplatesSchedulesListRoute),
                             stateExtender.buildDefinition(jobTemplatesSchedulesAddRoute),
-                            stateExtender.buildDefinition(jobTemplatesSchedulesEditRoute)
+                            stateExtender.buildDefinition(jobTemplatesSchedulesEditRoute),
+                            stateExtender.buildDefinition(workflowSchedulesRoute),
+                            stateExtender.buildDefinition(workflowSchedulesAddRoute),
+                            stateExtender.buildDefinition(workflowSchedulesEditRoute)
                         ])
                     };
                 });
diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js
index 5812ed7435..42face36b2 100644
--- a/awx/ui/client/src/templates/workflows.form.js
+++ b/awx/ui/client/src/templates/workflows.form.js
@@ -181,6 +181,11 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
                     title: i18n._('Completed Jobs'),
                     skipGenerator: true,
                     ngClick: "$state.go('templates.editWorkflowJobTemplate.completed_jobs')"
+                },
+                "schedules": {
+                    title: i18n._('Schedules'),
+                    skipGenerator: true,
+                    ngClick: "$state.go('templates.editWorkflowJobTemplate.schedules')"
                 }
             },
 

From ce09ab446d6c20bea8a5f4ecf520f2769c0afe08 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Fri, 11 May 2018 11:29:33 -0700
Subject: [PATCH 125/169] Moves scheduler to related tab for projects

Signed-off-by: Jared Tabor <jtabor@redhat.com>
---
 awx/ui/client/features/jobs/index.js          |   2 +
 .../organizations-job-templates.controller.js |  20 ---
 .../organizations-projects.controller.js      |   2 +-
 .../projects/list/projects-list.controller.js |   2 +-
 awx/ui/client/src/projects/main.js            |   9 +
 awx/ui/client/src/projects/projects.form.js   |   5 +
 awx/ui/client/src/scheduler/main.js           | 158 +-----------------
 .../src/scheduler/schedulerAdd.controller.js  |   2 +-
 .../src/scheduler/schedulerEdit.controller.js |   2 +-
 .../src/scheduler/schedulerList.controller.js |   4 +-
 .../client/src/scheduler/schedules.route.js   | 154 ++++++++++++++++-
 .../list-generator/list-generator.factory.js  |   4 +
 .../src/shared/stateDefinitions.factory.js    |   6 +-
 13 files changed, 185 insertions(+), 185 deletions(-)

diff --git a/awx/ui/client/features/jobs/index.js b/awx/ui/client/features/jobs/index.js
index c26f2b9d8f..5c244cd88a 100644
--- a/awx/ui/client/features/jobs/index.js
+++ b/awx/ui/client/features/jobs/index.js
@@ -1,5 +1,6 @@
 import JobsStrings from './jobs.strings';
 import jobsRoute from './routes/jobs.route';
+import { jobsSchedulesRoute } from '../../src/scheduler/schedules.route';
 
 const MODULE_NAME = 'at.features.jobs';
 
@@ -8,6 +9,7 @@ angular
     .service('JobsStrings', JobsStrings)
     .run(['$stateExtender', ($stateExtender) => {
         $stateExtender.addState(jobsRoute);
+        $stateExtender.addState(jobsSchedulesRoute);
     }]);
 
 export default MODULE_NAME;
diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
index 8c58157ab3..67003502ce 100644
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-job-templates.controller.js
@@ -76,25 +76,5 @@ export default ['$scope', '$rootScope',
         $scope.scheduleJob = function(id) {
             $state.go('templates.editJobTemplate.schedules', { id: id });
         };
-
-        // $scope.copyTemplate = function(id) {
-        //     Wait('start');
- 		// 	TemplateCopyService.get(id)
- 		// 	.then((data) => {
-        //             TemplateCopyService.set(data.results)
-        //         .then((results) => {
-        //             Wait('stop');
-        //             if(results.type && results.type === 'job_template') {
-        //                 $state.go('templates.editJobTemplate', {job_template_id: results.id}, {reload: true});
-        //             }
-        //         });
- 		// 	})
-  		// 	.catch(({data, status}) => {
-        //         ProcessErrors($rootScope, data, status, null, {hdr: 'Error!',
-        //         msg: 'Call failed. Return status: '+ status});
-        //     });
-        //
-        // };
-
     }
 ];
diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
index 51e753c8a4..48a59a967d 100644
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-projects.controller.js
@@ -301,7 +301,7 @@ export default ['$scope', '$rootScope', '$log', '$stateParams', 'Rest', 'Alert',
         $scope.editSchedules = function(id) {
             var project = Find({ list: $scope.projects, key: 'id', val: id });
             if (!(project.scm_type === "Manual" || Empty(project.scm_type)) && !(project.status === 'updating' || project.status === 'running' || project.status === 'pending')) {
-                $state.go('projectSchedules', { id: id });
+                $state.go('projects.edit.schedules', { project_id: id });
             }
         };
 
diff --git a/awx/ui/client/src/projects/list/projects-list.controller.js b/awx/ui/client/src/projects/list/projects-list.controller.js
index bea12bdf0d..c4aa5db6c8 100644
--- a/awx/ui/client/src/projects/list/projects-list.controller.js
+++ b/awx/ui/client/src/projects/list/projects-list.controller.js
@@ -332,7 +332,7 @@ export default ['$scope', '$rootScope', '$log', 'Rest', 'Alert',
         $scope.editSchedules = function(id) {
             var project = Find({ list: $scope.projects, key: 'id', val: id });
             if (!(project.scm_type === "Manual" || Empty(project.scm_type)) && !(project.status === 'updating' || project.status === 'running' || project.status === 'pending')) {
-                $state.go('projectSchedules', { id: id });
+                $state.go('projects.edit.schedules', { project_id: id });
             }
         };
     }
diff --git a/awx/ui/client/src/projects/main.js b/awx/ui/client/src/projects/main.js
index 8f186e5458..d8aaf9df36 100644
--- a/awx/ui/client/src/projects/main.js
+++ b/awx/ui/client/src/projects/main.js
@@ -13,6 +13,11 @@ import { N_ } from '../i18n';
 import GetProjectPath from './factories/get-project-path.factory';
 import GetProjectIcon from './factories/get-project-icon.factory';
 import GetProjectToolTip from './factories/get-project-tool-tip.factory';
+import {
+    projectsSchedulesListRoute,
+    projectsSchedulesAddRoute,
+    projectsSchedulesEditRoute
+} from '../scheduler/schedules.route';
 
 import ProjectsTemplatesRoute from '~features/templates/routes/projectsTemplatesList.route';
 import ProjectsStrings from './projects.strings';
@@ -66,6 +71,7 @@ angular.module('Projects', [])
                 let projectTree = stateDefinitions.generateTree({
                     parent: 'projects', // top-most node in the generated tree (will replace this state definition)
                     modes: ['add', 'edit'],
+                    generateSchedulerView: true,
                     list: 'ProjectList',
                     form: 'ProjectsForm',
                     controllers: {
@@ -99,6 +105,9 @@ angular.module('Projects', [])
                             return result.concat(definition.states);
                         }, [
                             stateExtender.buildDefinition(ProjectsTemplatesRoute),
+                            stateExtender.buildDefinition(projectsSchedulesListRoute),
+                            stateExtender.buildDefinition(projectsSchedulesAddRoute),
+                            stateExtender.buildDefinition(projectsSchedulesEditRoute)
                         ])
                     };
                 });
diff --git a/awx/ui/client/src/projects/projects.form.js b/awx/ui/client/src/projects/projects.form.js
index 1862f28722..14afb7e455 100644
--- a/awx/ui/client/src/projects/projects.form.js
+++ b/awx/ui/client/src/projects/projects.form.js
@@ -285,6 +285,11 @@ export default ['i18n', 'NotificationsList', 'TemplateList',
             templates: {
                 include: "TemplateList",
             },
+            schedules: {
+                title: i18n._('Schedules'),
+                skipGenerator: true,
+                ngClick: "$state.go('projects.edit.schedules')"
+            }
         }
 
     };
diff --git a/awx/ui/client/src/scheduler/main.js b/awx/ui/client/src/scheduler/main.js
index 76f3b91ad8..0736c2f007 100644
--- a/awx/ui/client/src/scheduler/main.js
+++ b/awx/ui/client/src/scheduler/main.js
@@ -16,7 +16,6 @@ import SchedulePost from './factories/schedule-post.factory';
 import ToggleSchedule from './factories/toggle-schedule.factory';
 import SchedulesList from './schedules.list';
 import ScheduledJobsList from './scheduled-jobs.list';
-import editScheduleResolve from './editSchedule.resolve';
 
 export default
     angular.module('scheduler', [])
@@ -29,159 +28,4 @@ export default
         .factory('ToggleSchedule', ToggleSchedule)
         .factory('SchedulesList', SchedulesList)
         .factory('ScheduledJobsList', ScheduledJobsList)
-        .directive('schedulerDatePicker', schedulerDatePicker)
-        .run(['$stateExtender', function($stateExtender) {
-            // Inventory sync schedule states registered in: awx/ui/client/src/inventories/manage/groups/main.js
-            // Scheduled jobs states registered in awx/uiclient/src/job-detail/main.js
-
-        
-            // projects
-            $stateExtender.addState({
-                searchPrefix: 'schedule',
-                name: 'projectSchedules',
-                route: '/projects/:id/schedules',
-                data: {
-                    activityStream: true,
-                    activityStreamTarget: 'project',
-                    activityStreamId: 'id'
-                },
-                ncyBreadcrumb: {
-                    parent: 'projects.edit({project_id: parentObject.id})',
-                    label: N_('SCHEDULES')
-                },
-                resolve: {
-                    Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath',
-                        function(list, qs, $stateParams, GetBasePath) {
-                            let path = `${GetBasePath('projects')}${$stateParams.id}/schedules`;
-                            return qs.search(path, $stateParams[`${list.iterator}_search`]);
-                        }
-                    ],
-                    ParentObject: ['$stateParams', 'Rest', 'GetBasePath', function($stateParams, Rest, GetBasePath){
-                        let path = `${GetBasePath('projects')}${$stateParams.id}`;
-                        Rest.setUrl(path);
-                        return Rest.get(path).then(response => response.data);
-                    }],
-                    UnifiedJobsOptions: ['Rest', 'GetBasePath', '$stateParams', '$q',
-                        function(Rest, GetBasePath, $stateParams, $q) {
-                            Rest.setUrl(GetBasePath('unified_jobs'));
-                            var val = $q.defer();
-                            Rest.options()
-                                .then(function(data) {
-                                    val.resolve(data.data);
-                                }, function(data) {
-                                    val.reject(data);
-                                });
-                            return val.promise;
-                        }],
-                    ScheduleList: ['SchedulesList', 'GetBasePath', '$stateParams',
-                        (SchedulesList, GetBasePath, $stateParams) => {
-                            let list = _.cloneDeep(SchedulesList);
-                            list.basePath = GetBasePath('projects') + $stateParams.id + '/schedules/';
-                            return list;
-                        }
-                    ]
-                },
-                views: {
-                    '@': {
-                        templateProvider: function(ScheduleList, generateList, ParentObject, $filter){
-                            // include name of parent resource in listTitle
-                            ScheduleList.listTitle = `${$filter('sanitize')(ParentObject.name)}<div class='List-titleLockup'></div>` + N_('SCHEDULES');
-                            let html = generateList.build({
-                                list: ScheduleList,
-                                mode: 'edit'
-                            });
-                            html = generateList.wrapPanel(html);
-                            return generateList.insertFormView() + html;
-                        },
-                        controller: 'schedulerListController'
-                    }
-                }
-            });
-
-            $stateExtender.addState({
-                name: 'projectSchedules.add',
-                route: '/add',
-                ncyBreadcrumb: {
-                    label: N_('CREATE SCHEDULE')
-                },
-                views: {
-                    'form': {
-                        controller: 'schedulerAddController',
-                        templateUrl: templateUrl("scheduler/schedulerForm"),
-                    }
-                }
-            });
-            $stateExtender.addState({
-                name: 'projectSchedules.edit',
-                route: '/:schedule_id',
-                ncyBreadcrumb: {
-                    label: '{{schedule_obj.name}}'
-                },
-                views: {
-                    'form': {
-                        controller: 'schedulerEditController',
-                        templateUrl: templateUrl("scheduler/schedulerForm"),
-                    }
-                },
-                resolve: editScheduleResolve()
-            });
-            // upcoming scheduled jobs
-            $stateExtender.addState({
-                searchPrefix: 'schedule',
-                name: 'jobs.schedules',
-                route: '/schedules',
-                params: {
-                    schedule_search: {
-                        value: {
-                            next_run__isnull: 'false',
-                            order_by: 'unified_job_template__polymorphic_ctype__model'
-                        },
-                        dynamic: true
-                    }
-                },
-                data: {
-                    activityStream: false,
-                },
-                ncyBreadcrumb: {
-                    parent: 'jobs',
-                    label: N_('SCHEDULED')
-                },
-                resolve: {
-                    ScheduleList: ['ScheduledJobsList', function(list){
-                        return list;
-                    }],
-                    Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath',
-                        function(list, qs, $stateParams, GetBasePath) {
-                            let path = GetBasePath('schedules');
-                            return qs.search(path, $stateParams[`${list.iterator}_search`]);
-                        }
-                    ],
-                    ParentObject: ['GetBasePath', (GetBasePath) =>{return {endpoint:GetBasePath('schedules')}; }],
-                    UnifiedJobsOptions: ['Rest', 'GetBasePath', '$stateParams', '$q',
-                        function(Rest, GetBasePath, $stateParams, $q) {
-                            Rest.setUrl(GetBasePath('unified_jobs'));
-                            var val = $q.defer();
-                            Rest.options()
-                                .then(function(data) {
-                                    val.resolve(data.data);
-                                }, function(data) {
-                                    val.reject(data);
-                                });
-                            return val.promise;
-                        }]
-                },
-                views: {
-                    'schedulesList@jobs': {
-                        templateProvider: function(ScheduleList, generateList){
-                            let html = generateList.build({
-                                list: ScheduleList,
-                                mode: 'edit',
-                                title: false
-                            });
-                            return html;
-                        },
-                        controller: 'schedulerListController'
-                    }
-                }
-            });
-        }]);
+        .directive('schedulerDatePicker', schedulerDatePicker);
diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
index e8ac324962..2b7256529e 100644
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@@ -277,7 +277,7 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
     }
 
     if ($state.current.name === 'templates.editWorkflowJobTemplate.schedules.add' ||
-        $state.current.name === 'projectSchedules.add' ||
+        $state.current.name === 'projects.edit.schedules.add' ||
         $state.current.name === 'inventories.edit.inventory_sources.edit.schedules.add'
     ){
         $scope.noVars = true;
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index f7441e0f7f..14fcf921f7 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -451,7 +451,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
 
         // extra_data field is not manifested in the UI when scheduling a Management Job
         if ($state.current.name !== 'managementJobsList.schedule.add' && $state.current.name !== 'managementJobsList.schedule.edit'){
-            if ($state.current.name === 'projectSchedules.edit' ||
+            if ($state.current.name === 'projects.edit.schedules.edit' ||
                 $state.current.name === 'inventories.edit.inventory_sources.edit.schedules.edit' ||
                 $state.current.name === 'templates.editWorkflowJobTemplate.schedules.add'
             ){
diff --git a/awx/ui/client/src/scheduler/schedulerList.controller.js b/awx/ui/client/src/scheduler/schedulerList.controller.js
index ab4198f3aa..f7f21df662 100644
--- a/awx/ui/client/src/scheduler/schedulerList.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerList.controller.js
@@ -199,9 +199,9 @@ export default [
 
                     case 'project_update':
                         deferred.resolve({
-                            name: 'projectSchedules.edit',
+                            name: 'projects.edit.schedules.edit',
                             params: {
-                                id: schedule.unified_job_template,
+                                project_id: schedule.unified_job_template,
                                 schedule_id: schedule.id
                             }
                         });
diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js
index 2f54060d9f..37658ff9a9 100644
--- a/awx/ui/client/src/scheduler/schedules.route.js
+++ b/awx/ui/client/src/scheduler/schedules.route.js
@@ -185,11 +185,163 @@ const workflowSchedulesEditRoute = {
     resolve: editScheduleResolve()
 };
 
+const projectsSchedulesListRoute = {
+    searchPrefix: 'schedule',
+    name: 'projects.edit.schedules',
+    route: '/schedules',
+    data: {
+        activityStream: true,
+        activityStreamTarget: 'project',
+        activityStreamId: 'id'
+    },
+    ncyBreadcrumb: {
+        parent: 'projects.edit({project_id: parentObject.id})',
+        label: N_('SCHEDULES')
+    },
+    resolve: {
+        Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath',
+            function(list, qs, $stateParams, GetBasePath) {
+                let path = `${GetBasePath('projects')}${$stateParams.project_id}/schedules`;
+                return qs.search(path, $stateParams[`${list.iterator}_search`]);
+            }
+        ],
+        ParentObject: ['$stateParams', 'Rest', 'GetBasePath', function($stateParams, Rest, GetBasePath){
+            let path = `${GetBasePath('projects')}${$stateParams.project_id}`;
+            Rest.setUrl(path);
+            return Rest.get(path).then(response => response.data);
+        }],
+        UnifiedJobsOptions: ['Rest', 'GetBasePath', '$stateParams', '$q',
+            function(Rest, GetBasePath, $stateParams, $q) {
+                Rest.setUrl(GetBasePath('unified_jobs'));
+                var val = $q.defer();
+                Rest.options()
+                    .then(function(data) {
+                        val.resolve(data.data);
+                    }, function(data) {
+                        val.reject(data);
+                    });
+                return val.promise;
+            }],
+        ScheduleList: ['SchedulesList', 'GetBasePath', '$stateParams',
+            (SchedulesList, GetBasePath, $stateParams) => {
+                let list = _.cloneDeep(SchedulesList);
+                list.basePath = GetBasePath('projects') + $stateParams.project_id + '/schedules/';
+                return list;
+            }
+        ]
+    },
+    views: {
+        related: {
+            templateProvider: function(ScheduleList, generateList, ParentObject, $filter){
+                ScheduleList.title = false;
+                let html = generateList.build({
+                    list: ScheduleList,
+                    mode: 'edit'
+                });
+                return html;
+            },
+            controller: 'schedulerListController'
+        }
+    }
+};
+
+const projectsSchedulesAddRoute = {
+    name: 'projects.edit.schedules.add',
+    route: '/add',
+    ncyBreadcrumb: {
+        label: N_('CREATE SCHEDULE')
+    },
+    views: {
+        'scheduler@projects': {
+            controller: 'schedulerAddController',
+            templateUrl: templateUrl("scheduler/schedulerForm"),
+        }
+    }
+};
+
+const projectsSchedulesEditRoute = {
+    name: 'projects.edit.schedules.edit',
+    route: '/:schedule_id',
+    ncyBreadcrumb: {
+        label: '{{schedule_obj.name}}'
+    },
+    views: {
+        'scheduler@projects': {
+            controller: 'schedulerEditController',
+            templateUrl: templateUrl("scheduler/schedulerForm"),
+        }
+    },
+    resolve: editScheduleResolve()
+};
+
+const jobsSchedulesRoute = {
+    searchPrefix: 'schedule',
+    name: 'jobs.schedules',
+    route: '/schedules',
+    params: {
+        schedule_search: {
+            value: {
+                next_run__isnull: 'false',
+                order_by: 'unified_job_template__polymorphic_ctype__model'
+            },
+            dynamic: true
+        }
+    },
+    data: {
+        activityStream: false,
+    },
+    ncyBreadcrumb: {
+        parent: 'jobs',
+        label: N_('SCHEDULED')
+    },
+    resolve: {
+        ScheduleList: ['ScheduledJobsList', function(list){
+            return list;
+        }],
+        Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath',
+            function(list, qs, $stateParams, GetBasePath) {
+                let path = GetBasePath('schedules');
+                return qs.search(path, $stateParams[`${list.iterator}_search`]);
+            }
+        ],
+        ParentObject: ['GetBasePath', (GetBasePath) =>{return {endpoint:GetBasePath('schedules')}; }],
+        UnifiedJobsOptions: ['Rest', 'GetBasePath', '$stateParams', '$q',
+            function(Rest, GetBasePath, $stateParams, $q) {
+                Rest.setUrl(GetBasePath('unified_jobs'));
+                var val = $q.defer();
+                Rest.options()
+                    .then(function(data) {
+                        val.resolve(data.data);
+                    }, function(data) {
+                        val.reject(data);
+                    });
+                return val.promise;
+            }]
+    },
+    views: {
+        'schedulesList@jobs': {
+            templateProvider: function(ScheduleList, generateList){
+                let html = generateList.build({
+                    list: ScheduleList,
+                    mode: 'edit',
+                    title: false
+                });
+                return html;
+            },
+            controller: 'schedulerListController'
+        }
+    }
+};
+
 export {
     jobTemplatesSchedulesListRoute,
     jobTemplatesSchedulesAddRoute,
     jobTemplatesSchedulesEditRoute,
     workflowSchedulesRoute,
     workflowSchedulesAddRoute,
-    workflowSchedulesEditRoute
+    workflowSchedulesEditRoute,
+    projectsSchedulesListRoute,
+    projectsSchedulesAddRoute,
+    projectsSchedulesEditRoute,
+    jobsSchedulesRoute
 };
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index 4e1189095e..a1f7088769 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -594,6 +594,10 @@ export default ['$compile', 'Attr', 'Icon',
 
             insertFormView: function(){
                 return `<div ui-view="form"></div>`;
+            },
+
+            insertSchedulerView: function(){
+                return `<div ui-view="scheduler"></div>`;
             }
         };
     }
diff --git a/awx/ui/client/src/shared/stateDefinitions.factory.js b/awx/ui/client/src/shared/stateDefinitions.factory.js
index 63182fa98f..99dc4f6f99 100644
--- a/awx/ui/client/src/shared/stateDefinitions.factory.js
+++ b/awx/ui/client/src/shared/stateDefinitions.factory.js
@@ -86,7 +86,11 @@ function($injector, $stateExtender, $log, i18n) {
                         });
                         html = generateList.wrapPanel(html);
                         // generateList.formView() inserts a ui-view="form" inside the list view's hierarchy
-                        return generateList.insertFormView() + html;
+                        html = generateList.insertFormView() + html;
+                        if(params.generateSchedulerView){
+                            html = generateList.insertSchedulerView() + html;
+                        }
+                        return html;
                     };
                 }
             }

From 77e195bbb9e084139bc4ede84d870d587034e0cb Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Fri, 11 May 2018 14:44:38 -0700
Subject: [PATCH 126/169] Moves schedules tab to related tab for sources form

---
 .../inventories/inventories.partial.html      |  1 +
 .../schedule/sources-schedule-add.route.js    |  3 +-
 .../schedule/sources-schedule-edit.route.js   |  7 ++-
 .../list/schedule/sources-schedule.route.js   | 52 ++++++++-----------
 .../sources/list/sources-list.controller.js   |  2 +-
 .../related/sources/sources.form.js           |  8 ++-
 awx/ui/client/src/scheduler/main.js           |  2 -
 .../src/scheduler/schedulerAdd.controller.js  | 14 +++--
 .../client/src/scheduler/schedules.route.js   |  6 +--
 9 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/awx/ui/client/src/inventories-hosts/inventories/inventories.partial.html b/awx/ui/client/src/inventories-hosts/inventories/inventories.partial.html
index 73bb0becd1..282fa47ad2 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/inventories.partial.html
+++ b/awx/ui/client/src/inventories-hosts/inventories/inventories.partial.html
@@ -1,6 +1,7 @@
 <div class="tab-pane" id="inventories-panel">
     <aw-limit-panels max-panels="2" panel-container="inventories-panel"></aw-limit-panels>
     <div ui-view="adhocForm"></div>
+    <div ui-view="scheduler"></div>
     <div ui-view="hostForm"></div>
     <div ui-view="nestedGroupForm"></div>
     <div ui-view="groupForm"></div>
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-add.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-add.route.js
index cb7ac3efb7..0b38774378 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-add.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-add.route.js
@@ -5,10 +5,11 @@ export default {
     name: 'inventories.edit.inventory_sources.edit.schedules.add',
     url: '/add',
     ncyBreadcrumb: {
+        parent: 'inventories.edit.inventory_sources.edit.schedules',
         label: N_("CREATE SCHEDULE")
     },
     views: {
-        'form': {
+        'scheduler@inventories': {
             controller: 'schedulerAddController',
             templateUrl: templateUrl("scheduler/schedulerForm")
         }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js
index 0fc89af835..52021fc34d 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js
@@ -1,15 +1,18 @@
 import {templateUrl} from '../../../../../../shared/template-url/template-url.factory';
+import editScheduleResolve from '../../../../../../scheduler/editSchedule.resolve';
 
 export default {
     name: 'inventories.edit.inventory_sources.edit.schedules.edit',
     url: '/:schedule_id',
     ncyBreadcrumb: {
+        parent: "inventories.edit.inventory_sources.edit.schedules",
         label: "{{schedule_obj.name}}"
     },
     views: {
-        'form': {
+        'scheduler@inventories': {
             templateUrl: templateUrl("scheduler/schedulerForm"),
             controller: 'schedulerEditController',
         }
-    }
+    },
+    resolve: editScheduleResolve()
 };
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule.route.js
index 962263e673..aebe56b624 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule.route.js
@@ -1,21 +1,35 @@
 import { N_ } from '../../../../../../i18n';
 
 export default {
+    searchPrefix: 'schedule',
     name: 'inventories.edit.inventory_sources.edit.schedules',
     url: '/schedules',
-    searchPrefix: 'schedule',
     ncyBreadcrumb: {
+        parent: 'inventories.edit.inventory_sources.edit',
         label: N_('SCHEDULES')
     },
+    views: {
+        'related': {
+            templateProvider: function(SchedulesList, generateList){
+                SchedulesList.title = false;
+                let html = generateList.build({
+                    list: SchedulesList,
+                    mode: 'edit'
+                });
+                return html;
+            },
+            controller: 'schedulerListController'
+        }
+    },
     resolve: {
-        Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath', 'inventorySourceData',
-            function(list, qs, $stateParams, GetBasePath, inventorySourceData) {
-                let path = `${inventorySourceData.related.schedules}`;
+        Dataset: ['ScheduleList', 'QuerySet', '$stateParams', 'GetBasePath', 'inventorySource',
+            function(list, qs, $stateParams, GetBasePath, inventorySource) {
+                let path = `${inventorySource.get().related.schedules}`;
                 return qs.search(path, $stateParams[`${list.iterator}_search`]);
             }
         ],
-        ParentObject: ['inventorySourceData', function(inventorySourceData) {
-            return inventorySourceData;
+        ParentObject: ['inventorySource', function(inventorySource) {
+            return inventorySource.get();
         }],
         UnifiedJobsOptions: ['Rest', 'GetBasePath', '$stateParams', '$q',
             function(Rest, GetBasePath, $stateParams, $q) {
@@ -29,32 +43,12 @@ export default {
                     });
                 return val.promise;
             }],
-        ScheduleList: ['SchedulesList', 'inventorySourceData',
-            (SchedulesList, inventorySourceData) => {
+        ScheduleList: ['SchedulesList', 'inventorySource',
+            (SchedulesList, inventorySource) => {
                 let list = _.cloneDeep(SchedulesList);
-                list.basePath = `${inventorySourceData.related.schedules}`;
+                list.basePath = `${inventorySource.get().related.schedules}`;
                 return list;
             }
         ]
-    },
-    views: {
-        // clear form template when views render in this substate
-        'form': {
-            templateProvider: () => ''
-        },
-        // target the un-named ui-view @ root level
-        '@': {
-            templateProvider: function(ScheduleList, generateList, ParentObject, $filter) {
-                // include name of parent resource in listTitle
-                ScheduleList.listTitle = `${$filter('sanitize')(ParentObject.name)}<div class='List-titleLockup'></div>` + N_('SCHEDULES');
-                let html = generateList.build({
-                    list: ScheduleList,
-                    mode: 'edit'
-                });
-                html = generateList.wrapPanel(html);
-                return "<div class='InventoryManage-container'>" + generateList.insertFormView() + html + "</div>";
-            },
-            controller: 'schedulerListController'
-        }
     }
 };
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js
index 25d88d695e..6b2d43ee55 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.controller.js
@@ -222,7 +222,7 @@
         $scope.scheduleSource = function(id) {
             // Add this inv source's id to the array of inv source id's so that it gets
             // added to the breadcrumb trail
-            $state.go('inventories.edit.inventory_sources.edit.schedules', {inventory_source_id: id}, {reload: true});
+            $state.go('inventories.edit.inventory_sources.edit.schedules',{inventory_source_id: id});
         };
 
         $scope.syncAllSources = function() {
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js
index d7d6e31c2b..89299827b9 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js
@@ -411,8 +411,14 @@ return {
     },
 
     related: {
-        notifications: notifications_object
+        notifications: notifications_object,
+        schedules: {
+            title: i18n._('Schedules'),
+            skipGenerator: true,
+            ngClick: "$state.go('inventories.edit.inventory_sources.edit.schedules')"
+        }
     }
+
 };
 
 }];
diff --git a/awx/ui/client/src/scheduler/main.js b/awx/ui/client/src/scheduler/main.js
index 0736c2f007..038053e83a 100644
--- a/awx/ui/client/src/scheduler/main.js
+++ b/awx/ui/client/src/scheduler/main.js
@@ -7,9 +7,7 @@
 import listController from './schedulerList.controller';
 import addController from './schedulerAdd.controller';
 import editController from './schedulerEdit.controller';
-import {templateUrl} from '../shared/template-url/template-url.factory';
 import schedulerDatePicker from './schedulerDatePicker.directive';
-import { N_ } from '../i18n';
 import DeleteSchedule from './factories/delete-schedule.factory';
 import RRuleToAPI from './factories/r-rule-to-api.factory';
 import SchedulePost from './factories/schedule-post.factory';
diff --git a/awx/ui/client/src/scheduler/schedulerAdd.controller.js b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
index 2b7256529e..5c87f3c484 100644
--- a/awx/ui/client/src/scheduler/schedulerAdd.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerAdd.controller.js
@@ -8,12 +8,12 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
     '$scope', '$rootScope', 'CreateSelect2', 'ParseTypeChange', 'GetBasePath',
     'Rest', 'ParentObject', 'JobTemplateModel', '$q', 'Empty', 'SchedulePost',
     'ProcessErrors', 'SchedulerInit', '$location', 'PromptService', 'RRuleToAPI', 'moment',
-    'WorkflowJobTemplateModel', 'TemplatesStrings',
+    'WorkflowJobTemplateModel', 'TemplatesStrings', 'rbacUiControlService',
     function($filter, $state, $stateParams, $http, Wait,
         $scope, $rootScope, CreateSelect2, ParseTypeChange, GetBasePath,
         Rest, ParentObject, JobTemplate, $q, Empty, SchedulePost,
         ProcessErrors, SchedulerInit, $location, PromptService, RRuleToAPI, moment,
-        WorkflowJobTemplate, TemplatesStrings
+        WorkflowJobTemplate, TemplatesStrings, rbacUiControlService
     ) {
 
     var base = $scope.base || $location.path().replace(/^\//, '').split('/')[0],
@@ -21,7 +21,15 @@ export default ['$filter', '$state', '$stateParams', '$http', 'Wait',
         job_type;
 
     var schedule_url = ParentObject.related.schedules || `${ParentObject.related.inventory_source}schedules`;
-
+    if (ParentObject){
+        $scope.parentObject = ParentObject;
+        let scheduleEndpoint = ParentObject.endpoint|| ParentObject.related.schedules || `${ParentObject.related.inventory_source}schedules`;
+        $scope.canAdd = false;
+        rbacUiControlService.canAdd(scheduleEndpoint)
+            .then(function(params) {
+                $scope.canAdd = params.canAdd;
+            });
+    }
     let processSchedulerEndDt = function(){
         // set the schedulerEndDt to be equal to schedulerStartDt + 1 day @ midnight
         var dt = new Date($scope.schedulerUTCTime);
diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js
index 37658ff9a9..75f61ca009 100644
--- a/awx/ui/client/src/scheduler/schedules.route.js
+++ b/awx/ui/client/src/scheduler/schedules.route.js
@@ -49,7 +49,7 @@ const jobTemplatesSchedulesListRoute = {
     },
     views: {
         related: {
-            templateProvider: function(ScheduleList, generateList, ParentObject, $filter){
+            templateProvider: function(ScheduleList, generateList){
                 ScheduleList.title = false;
                 let html = generateList.build({
                     list: ScheduleList,
@@ -141,7 +141,7 @@ const workflowSchedulesRoute = {
     },
     views: {
         related: {
-            templateProvider: function(ScheduleList, generateList, ParentObject, $filter){
+            templateProvider: function(ScheduleList, generateList){
                 ScheduleList.title = false;
                 let html = generateList.build({
                     list: ScheduleList,
@@ -232,7 +232,7 @@ const projectsSchedulesListRoute = {
     },
     views: {
         related: {
-            templateProvider: function(ScheduleList, generateList, ParentObject, $filter){
+            templateProvider: function(ScheduleList, generateList){
                 ScheduleList.title = false;
                 let html = generateList.build({
                     list: ScheduleList,

From 2f5eefe809b3b3be0dbc2d447270f23cdac68823 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Thu, 10 May 2018 21:39:55 -0400
Subject: [PATCH 127/169] push initial events on partially complete job
 initialization

---
 .../features/output/index.controller.js       | 18 +++++++-----
 awx/ui/client/features/output/index.js        | 29 ++++++++++++-------
 .../client/features/output/render.service.js  |  6 ++--
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js
index e84c93d708..b4d01c5a90 100644
--- a/awx/ui/client/features/output/index.controller.js
+++ b/awx/ui/client/features/output/index.controller.js
@@ -67,7 +67,6 @@ function init () {
     });
 
     render.init({
-        get: () => resource.model.get(`related.${resource.related}.results`),
         compile: html => $compile(html)($scope),
         isStreamActive: engine.isActive,
     });
@@ -95,21 +94,24 @@ function init () {
         }
     });
 
-    $scope.$on(resource.ws.events, handleJobEvent);
-    $scope.$on(resource.ws.status, handleStatusEvent);
-
     if (!status.state.running) {
-        next();
+        return next();
     }
+
+    $scope.$on(resource.ws.events, (scope, data) => handleJobEvent(data));
+    $scope.$on(resource.ws.status, (scope, data) => handleStatusEvent(data));
+
+    return resource.model
+        .get(`related.${resource.related}.results`)
+        .forEach(handleJobEvent);
 }
 
-function handleStatusEvent (scope, data) {
+function handleStatusEvent (data) {
     status.pushStatusEvent(data);
 }
 
-function handleJobEvent (scope, data) {
+function handleJobEvent (data) {
     engine.pushJobEvent(data);
-
     status.pushJobEvent(data);
 }
 
diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js
index 813d1c2af3..a8d635ed3a 100644
--- a/awx/ui/client/features/output/index.js
+++ b/awx/ui/client/features/output/index.js
@@ -70,13 +70,20 @@ function resolveResource (
             return null;
     }
 
-    const params = { page_size: PAGE_SIZE, order_by: 'start_line' };
-    const config = { pageCache: PAGE_CACHE, pageLimit: PAGE_LIMIT, params };
+    const params = {
+        page_size: PAGE_SIZE,
+        order_by: 'start_line',
+    };
+
+    const config = {
+        params,
+        pageCache: PAGE_CACHE,
+        pageLimit: PAGE_LIMIT,
+    };
 
     if (job_event_search) { // eslint-disable-line camelcase
-        const queryParams = qs.encodeQuerysetObject(qs.decodeArr(job_event_search));
-
-        Object.assign(config.params, queryParams);
+        const query = qs.encodeQuerysetObject(qs.decodeArr(job_event_search));
+        Object.assign(config.params, query);
     }
 
     Wait('start');
@@ -89,7 +96,6 @@ function resolveResource (
             }
 
             promises.push(model.extend('get', related, config));
-
             return Promise.all(promises);
         })
         .then(([stats, model]) => ({
@@ -107,18 +113,19 @@ function resolveResource (
                 size: PAGE_SIZE,
                 pageLimit: PAGE_LIMIT
             }
-        }))
-        .finally(() => Wait('stop'));
+        }));
 
     if (!handleErrors) {
-        return resourcePromise;
+        return resourcePromise
+            .finally(() => Wait('stop'));
     }
 
     return resourcePromise
         .catch(({ data, status }) => {
-            $state.go($state.current, $state.params, { reload: true });
             qs.error(data, status);
-        });
+            return $state.go($state.current, $state.params, { reload: true });
+        })
+        .finally(() => Wait('stop'));
 }
 
 function resolveWebSocketConnection ($stateParams, SocketService) {
diff --git a/awx/ui/client/features/output/render.service.js b/awx/ui/client/features/output/render.service.js
index 9981cac65b..08a3498fd2 100644
--- a/awx/ui/client/features/output/render.service.js
+++ b/awx/ui/client/features/output/render.service.js
@@ -30,11 +30,11 @@ const re = new RegExp(pattern);
 const hasAnsi = input => re.test(input);
 
 function JobRenderService ($q, $sce, $window) {
-    this.init = ({ compile, apply, isStreamActive }) => {
+    this.init = ({ compile, isStreamActive }) => {
         this.parent = null;
         this.record = {};
         this.el = $(ELEMENT_TBODY);
-        this.hooks = { isStreamActive, compile, apply };
+        this.hooks = { isStreamActive, compile };
     };
 
     this.sortByLineNumber = (a, b) => {
@@ -239,8 +239,6 @@ function JobRenderService ($q, $sce, $window) {
         return list;
     };
 
-    this.getEvents = () => this.hooks.get();
-
     this.insert = (events, insert) => {
         const result = this.transformEventGroup(events);
         const html = this.trustHtml(result.html);

From f3343f780c70da9c711b54a3e6f338457432f940 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Fri, 11 May 2018 16:42:55 -0400
Subject: [PATCH 128/169] always remove websocket listeners

---
 .../features/output/index.controller.js       | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js
index b4d01c5a90..5ba68bc8e6 100644
--- a/awx/ui/client/features/output/index.controller.js
+++ b/awx/ui/client/features/output/index.controller.js
@@ -9,6 +9,7 @@ let engine;
 let status;
 
 let vm;
+let listeners = [];
 
 function JobsIndexController (
     _resource_,
@@ -89,21 +90,32 @@ function init () {
             status.setJobStatus('running');
         },
         onStop () {
+            stopListening();
             status.updateStats();
             status.dispatch();
         }
     });
 
     if (!status.state.running) {
-        return next();
+        next();
+        return;
     }
 
-    $scope.$on(resource.ws.events, (scope, data) => handleJobEvent(data));
-    $scope.$on(resource.ws.status, (scope, data) => handleStatusEvent(data));
-
-    return resource.model
-        .get(`related.${resource.related}.results`)
+    resource.model.get(`related.${resource.related}.results`)
         .forEach(handleJobEvent);
+
+    startListening();
+}
+
+function stopListening () {
+    listeners.forEach(deregister => deregister());
+    listeners = [];
+}
+
+function startListening () {
+    stopListening();
+    listeners.push($scope.$on(resource.ws.events, (scope, data) => handleJobEvent(data)));
+    listeners.push($scope.$on(resource.ws.status, (scope, data) => handleStatusEvent(data)));
 }
 
 function handleStatusEvent (data) {
@@ -115,9 +127,8 @@ function handleJobEvent (data) {
     status.pushJobEvent(data);
 }
 
-function devClear (pageMode) {
-    init(pageMode);
-    render.clear();
+function devClear () {
+    render.clear().then(() => init());
 }
 
 function next () {

From 665354c32e19b4df83daff960235a25fcf4bf359 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Fri, 11 May 2018 19:27:45 -0400
Subject: [PATCH 129/169] add skip functionality to event replay tool

---
 .../management/commands/replay_job_events.py  | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/awx/main/management/commands/replay_job_events.py b/awx/main/management/commands/replay_job_events.py
index 47ff723678..74bd9eb09f 100644
--- a/awx/main/management/commands/replay_job_events.py
+++ b/awx/main/management/commands/replay_job_events.py
@@ -95,7 +95,7 @@ class ReplayJobEvents():
             raise RuntimeError("Job is of type {} and replay is not yet supported.".format(type(job)))
             sys.exit(1)
 
-    def run(self, job_id, speed=1.0, verbosity=0):
+    def run(self, job_id, speed=1.0, verbosity=0, skip=0):
         stats = {
             'events_ontime': {
                 'total': 0,
@@ -126,7 +126,10 @@ class ReplayJobEvents():
             sys.exit(1)
 
         je_previous = None
-        for je_current in job_events:
+        for n, je_current in enumerate(job_events):
+            if n < skip:
+                continue
+
             if not je_previous:
                 stats['recording_start'] = je_current.created
                 self.start(je_current.created)
@@ -163,21 +166,25 @@ class ReplayJobEvents():
 
             stats['events_total'] += 1
             je_previous = je_current
-        
-        stats['replay_end'] = self.now()
-        stats['replay_duration'] = (stats['replay_end'] - stats['replay_start']).total_seconds()
-        stats['replay_start'] = stats['replay_start'].isoformat()
-        stats['replay_end'] = stats['replay_end'].isoformat()
 
-        stats['recording_end'] = je_current.created
-        stats['recording_duration'] = (stats['recording_end'] - stats['recording_start']).total_seconds()
-        stats['recording_start'] = stats['recording_start'].isoformat()
-        stats['recording_end'] = stats['recording_end'].isoformat()
+        if stats['events_total'] > 2:
+            stats['replay_end'] = self.now()
+            stats['replay_duration'] = (stats['replay_end'] - stats['replay_start']).total_seconds()
+            stats['replay_start'] = stats['replay_start'].isoformat()
+            stats['replay_end'] = stats['replay_end'].isoformat()
+
+            stats['recording_end'] = je_current.created
+            stats['recording_duration'] = (stats['recording_end'] - stats['recording_start']).total_seconds()
+            stats['recording_start'] = stats['recording_start'].isoformat()
+            stats['recording_end'] = stats['recording_end'].isoformat()
+
+            stats['events_ontime']['percentage'] = (stats['events_ontime']['total'] / float(stats['events_total'])) * 100.00
+            stats['events_late']['percentage'] = (stats['events_late']['total'] / float(stats['events_total'])) * 100.00
+            stats['events_distance_average'] = stats['events_distance_total'] / stats['events_total']
+            stats['events_late']['lateness_average'] = stats['events_late']['lateness_total'] / stats['events_late']['total']
+        else:
+            stats = {'events_total': stats['events_total']}
 
-        stats['events_ontime']['percentage'] = (stats['events_ontime']['total'] / float(stats['events_total'])) * 100.00
-        stats['events_late']['percentage'] = (stats['events_late']['total'] / float(stats['events_total'])) * 100.00
-        stats['events_distance_average'] = stats['events_distance_total'] / stats['events_total']
-        stats['events_late']['lateness_average'] = stats['events_late']['lateness_total'] / stats['events_late']['total']
         if verbosity >= 2:
             print(json.dumps(stats, indent=4, sort_keys=True))
 
@@ -191,11 +198,14 @@ class Command(BaseCommand):
                             help='Id of the job to replay (job or adhoc)')
         parser.add_argument('--speed', dest='speed', type=int, metavar='s',
                             help='Speedup factor.')
+        parser.add_argument('--skip', dest='skip', type=int, metavar='k',
+                            help='Number of events to skip.')
 
     def handle(self, *args, **options):
         job_id = options.get('job_id')
         speed = options.get('speed') or 1
         verbosity = options.get('verbosity') or 0
+        skip = options.get('skip') or 0
 
         replayer = ReplayJobEvents()
-        replayer.run(job_id, speed, verbosity)
+        replayer.run(job_id, speed, verbosity, skip)

From ec7f1c25407dfbe4d3340458a8b2fac046f4ed9e Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Mon, 14 May 2018 10:12:49 -0400
Subject: [PATCH 130/169] enforce consistently setting view search_fields

---
 awx/api/views.py                  | 56 +++++++++++++++++++++++++++++++
 awx/main/tests/unit/test_views.py | 45 +++++++++++++++++++++++++
 2 files changed, 101 insertions(+)

diff --git a/awx/api/views.py b/awx/api/views.py
index ff9b5d234a..16320d9d57 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -610,6 +610,7 @@ class InstanceList(ListAPIView):
     view_name = _("Instances")
     model = Instance
     serializer_class = InstanceSerializer
+    search_fields = ('hostname',)
 
 
 class InstanceDetail(RetrieveUpdateAPIView):
@@ -696,6 +697,7 @@ class InstanceGroupInstanceList(InstanceGroupMembershipMixin, SubListAttachDetac
     serializer_class = InstanceSerializer
     parent_model = InstanceGroup
     relationship = "instances"
+    search_fields = ('hostname',)
 
 
 class ScheduleList(ListAPIView):
@@ -1072,6 +1074,7 @@ class OrganizationActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIV
     serializer_class = ActivityStreamSerializer
     parent_model = Organization
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
 
 class OrganizationNotificationTemplatesList(SubListCreateAttachDetachAPIView):
@@ -1126,6 +1129,7 @@ class OrganizationObjectRolesList(SubListAPIView):
     model = Role
     serializer_class = RoleSerializer
     parent_model = Organization
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         po = self.get_parent_object()
@@ -1165,6 +1169,7 @@ class TeamRolesList(SubListAttachDetachAPIView):
     metadata_class = RoleMetadata
     parent_model = Team
     relationship='member_role.children'
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         team = get_object_or_404(Team, pk=self.kwargs['pk'])
@@ -1202,6 +1207,7 @@ class TeamObjectRolesList(SubListAPIView):
     model = Role
     serializer_class = RoleSerializer
     parent_model = Team
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         po = self.get_parent_object()
@@ -1233,6 +1239,7 @@ class TeamActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView):
     serializer_class = ActivityStreamSerializer
     parent_model = Team
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
     def get_queryset(self):
         parent = self.get_parent_object()
@@ -1328,6 +1335,7 @@ class ProjectActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView):
     serializer_class = ActivityStreamSerializer
     parent_model = Project
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
     def get_queryset(self):
         parent = self.get_parent_object()
@@ -1415,6 +1423,7 @@ class ProjectUpdateEventsList(SubListAPIView):
     parent_model = ProjectUpdate
     relationship = 'project_update_events'
     view_name = _('Project Update Events List')
+    search_fields = ('stdout',)
 
     def finalize_response(self, request, response, *args, **kwargs):
         response['X-UI-Max-Events'] = settings.MAX_UI_JOB_EVENTS
@@ -1428,6 +1437,7 @@ class SystemJobEventsList(SubListAPIView):
     parent_model = SystemJob
     relationship = 'system_job_events'
     view_name = _('System Job Events List')
+    search_fields = ('stdout',)
 
     def finalize_response(self, request, response, *args, **kwargs):
         response['X-UI-Max-Events'] = settings.MAX_UI_JOB_EVENTS
@@ -1441,6 +1451,7 @@ class InventoryUpdateEventsList(SubListAPIView):
     parent_model = InventoryUpdate
     relationship = 'inventory_update_events'
     view_name = _('Inventory Update Events List')
+    search_fields = ('stdout',)
 
     def finalize_response(self, request, response, *args, **kwargs):
         response['X-UI-Max-Events'] = settings.MAX_UI_JOB_EVENTS
@@ -1468,6 +1479,7 @@ class ProjectUpdateNotificationsList(SubListAPIView):
     serializer_class = NotificationSerializer
     parent_model = ProjectUpdate
     relationship = 'notifications'
+    search_fields = ('subject', 'notification_type', 'body',)
 
 
 class ProjectUpdateScmInventoryUpdates(SubListCreateAPIView):
@@ -1491,6 +1503,7 @@ class ProjectObjectRolesList(SubListAPIView):
     model = Role
     serializer_class = RoleSerializer
     parent_model = Project
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         po = self.get_parent_object()
@@ -1573,6 +1586,7 @@ class OAuth2ApplicationActivityStreamList(ActivityStreamEnforcementMixin, SubLis
     parent_model = OAuth2Application
     relationship = 'activitystream_set'
     swagger_topic = 'Authentication'
+    search_fields = ('changes',)
 
 
 class OAuth2TokenList(ListCreateAPIView):
@@ -1657,6 +1671,7 @@ class OAuth2TokenActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIVi
     parent_model = OAuth2AccessToken
     relationship = 'activitystream_set'
     swagger_topic = 'Authentication'
+    search_fields = ('changes',)
 
 
 class UserTeamsList(ListAPIView):
@@ -1680,6 +1695,7 @@ class UserRolesList(SubListAttachDetachAPIView):
     parent_model = User
     relationship='roles'
     permission_classes = (IsAuthenticated,)
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         u = get_object_or_404(User, pk=self.kwargs['pk'])
@@ -1766,6 +1782,7 @@ class UserActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView):
     serializer_class = ActivityStreamSerializer
     parent_model = User
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
     def get_queryset(self):
         parent = self.get_parent_object()
@@ -1852,6 +1869,7 @@ class CredentialTypeActivityStreamList(ActivityStreamEnforcementMixin, SubListAP
     serializer_class = ActivityStreamSerializer
     parent_model = CredentialType
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
 
 # remove in 3.3
@@ -1965,6 +1983,7 @@ class CredentialActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIVie
     serializer_class = ActivityStreamSerializer
     parent_model = Credential
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
 
 class CredentialAccessList(ResourceAccessList):
@@ -1978,6 +1997,7 @@ class CredentialObjectRolesList(SubListAPIView):
     model = Role
     serializer_class = RoleSerializer
     parent_model = Credential
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         po = self.get_parent_object()
@@ -2018,6 +2038,7 @@ class InventoryScriptObjectRolesList(SubListAPIView):
     model = Role
     serializer_class = RoleSerializer
     parent_model = CustomInventoryScript
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         po = self.get_parent_object()
@@ -2105,6 +2126,7 @@ class InventoryActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView
     serializer_class = ActivityStreamSerializer
     parent_model = Inventory
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
     def get_queryset(self):
         parent = self.get_parent_object()
@@ -2132,6 +2154,7 @@ class InventoryObjectRolesList(SubListAPIView):
     model = Role
     serializer_class = RoleSerializer
     parent_model = Inventory
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         po = self.get_parent_object()
@@ -2275,6 +2298,7 @@ class HostActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView):
     serializer_class = ActivityStreamSerializer
     parent_model = Host
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
     def get_queryset(self):
         parent = self.get_parent_object()
@@ -2288,6 +2312,7 @@ class HostFactVersionsList(SystemTrackingEnforcementMixin, ParentMixin, ListAPIV
     model = Fact
     serializer_class = FactVersionSerializer
     parent_model = Host
+    search_fields = ('facts',)
 
     def get_queryset(self):
         from_spec = self.request.query_params.get('from', None)
@@ -2521,6 +2546,7 @@ class GroupActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView):
     serializer_class = ActivityStreamSerializer
     parent_model = Group
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
     def get_queryset(self):
         parent = self.get_parent_object()
@@ -2752,6 +2778,7 @@ class InventorySourceActivityStreamList(ActivityStreamEnforcementMixin, SubListA
     serializer_class = ActivityStreamSerializer
     parent_model = InventorySource
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
 
 class InventorySourceNotificationTemplatesAnyList(SubListCreateAttachDetachAPIView):
@@ -2891,6 +2918,7 @@ class InventoryUpdateNotificationsList(SubListAPIView):
     serializer_class = NotificationSerializer
     parent_model = InventoryUpdate
     relationship = 'notifications'
+    search_fields = ('subject', 'notification_type', 'body',)
 
 
 class JobTemplateList(ListCreateAPIView):
@@ -3229,6 +3257,7 @@ class JobTemplateActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIVi
     serializer_class = ActivityStreamSerializer
     parent_model = JobTemplate
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
 
 class JobTemplateNotificationTemplatesAnyList(SubListCreateAttachDetachAPIView):
@@ -3512,6 +3541,7 @@ class JobTemplateObjectRolesList(SubListAPIView):
     model = Role
     serializer_class = RoleSerializer
     parent_model = JobTemplate
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         po = self.get_parent_object()
@@ -3529,6 +3559,7 @@ class WorkflowJobNodeList(WorkflowsEnforcementMixin, ListAPIView):
 
     model = WorkflowJobNode
     serializer_class = WorkflowJobNodeListSerializer
+    search_fields = ('unified_job_template__name', 'unified_job_template__description',)
 
 
 class WorkflowJobNodeDetail(WorkflowsEnforcementMixin, RetrieveAPIView):
@@ -3549,6 +3580,7 @@ class WorkflowJobTemplateNodeList(WorkflowsEnforcementMixin, ListCreateAPIView):
 
     model = WorkflowJobTemplateNode
     serializer_class = WorkflowJobTemplateNodeSerializer
+    search_fields = ('unified_job_template__name', 'unified_job_template__description',)
 
 
 class WorkflowJobTemplateNodeDetail(WorkflowsEnforcementMixin, RetrieveUpdateDestroyAPIView):
@@ -3570,6 +3602,7 @@ class WorkflowJobTemplateNodeChildrenBaseList(WorkflowsEnforcementMixin, Enforce
     parent_model = WorkflowJobTemplateNode
     relationship = ''
     enforce_parent_relationship = 'workflow_job_template'
+    search_fields = ('unified_job_template__name', 'unified_job_template__description',)
 
     '''
     Limit the set of WorkflowJobTemplateNodes to the related nodes of specified by
@@ -3639,6 +3672,7 @@ class WorkflowJobNodeChildrenBaseList(WorkflowsEnforcementMixin, SubListAPIView)
     serializer_class = WorkflowJobNodeListSerializer
     parent_model = WorkflowJobNode
     relationship = ''
+    search_fields = ('unified_job_template__name', 'unified_job_template__description',)
 
     #
     #Limit the set of WorkflowJobeNodes to the related nodes of specified by
@@ -3794,6 +3828,7 @@ class WorkflowJobTemplateWorkflowNodesList(WorkflowsEnforcementMixin, SubListCre
     parent_model = WorkflowJobTemplate
     relationship = 'workflow_job_template_nodes'
     parent_key = 'workflow_job_template'
+    search_fields = ('unified_job_template__name', 'unified_job_template__description',)
 
     def get_queryset(self):
         return super(WorkflowJobTemplateWorkflowNodesList, self).get_queryset().order_by('id')
@@ -3854,6 +3889,7 @@ class WorkflowJobTemplateObjectRolesList(WorkflowsEnforcementMixin, SubListAPIVi
     model = Role
     serializer_class = RoleSerializer
     parent_model = WorkflowJobTemplate
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         po = self.get_parent_object()
@@ -3867,6 +3903,7 @@ class WorkflowJobTemplateActivityStreamList(WorkflowsEnforcementMixin, ActivityS
     serializer_class = ActivityStreamSerializer
     parent_model = WorkflowJobTemplate
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
     def get_queryset(self):
         parent = self.get_parent_object()
@@ -3896,6 +3933,7 @@ class WorkflowJobWorkflowNodesList(WorkflowsEnforcementMixin, SubListAPIView):
     parent_model = WorkflowJob
     relationship = 'workflow_job_nodes'
     parent_key = 'workflow_job'
+    search_fields = ('unified_job_template__name', 'unified_job_template__description',)
 
     def get_queryset(self):
         return super(WorkflowJobWorkflowNodesList, self).get_queryset().order_by('id')
@@ -3924,6 +3962,7 @@ class WorkflowJobNotificationsList(WorkflowsEnforcementMixin, SubListAPIView):
     serializer_class = NotificationSerializer
     parent_model = WorkflowJob
     relationship = 'notifications'
+    search_fields = ('subject', 'notification_type', 'body',)
 
 
 class WorkflowJobActivityStreamList(WorkflowsEnforcementMixin, ActivityStreamEnforcementMixin, SubListAPIView):
@@ -3932,6 +3971,7 @@ class WorkflowJobActivityStreamList(WorkflowsEnforcementMixin, ActivityStreamEnf
     serializer_class = ActivityStreamSerializer
     parent_model = WorkflowJob
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
 
 class SystemJobTemplateList(ListAPIView):
@@ -4087,6 +4127,7 @@ class JobActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIView):
     serializer_class = ActivityStreamSerializer
     parent_model = Job
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
 
 # TODO: remove endpoint in 3.3
@@ -4290,6 +4331,7 @@ class JobNotificationsList(SubListAPIView):
     serializer_class = NotificationSerializer
     parent_model = Job
     relationship = 'notifications'
+    search_fields = ('subject', 'notification_type', 'body',)
 
 
 class BaseJobHostSummariesList(SubListAPIView):
@@ -4299,6 +4341,7 @@ class BaseJobHostSummariesList(SubListAPIView):
     parent_model = None # Subclasses must define this attribute.
     relationship = 'job_host_summaries'
     view_name = _('Job Host Summaries List')
+    search_fields = ('host_name',)
 
     def get_queryset(self):
         parent = self.get_parent_object()
@@ -4331,6 +4374,7 @@ class JobEventList(ListAPIView):
 
     model = JobEvent
     serializer_class = JobEventSerializer
+    search_fields = ('stdout',)
 
 
 class JobEventDetail(RetrieveAPIView):
@@ -4346,6 +4390,7 @@ class JobEventChildrenList(SubListAPIView):
     parent_model = JobEvent
     relationship = 'children'
     view_name = _('Job Event Children List')
+    search_fields = ('stdout',)
 
 
 class JobEventHostsList(HostRelatedSearchMixin, SubListAPIView):
@@ -4559,6 +4604,7 @@ class AdHocCommandEventList(ListAPIView):
 
     model = AdHocCommandEvent
     serializer_class = AdHocCommandEventSerializer
+    search_fields = ('stdout',)
 
 
 class AdHocCommandEventDetail(RetrieveAPIView):
@@ -4574,6 +4620,7 @@ class BaseAdHocCommandEventsList(SubListAPIView):
     parent_model = None # Subclasses must define this attribute.
     relationship = 'ad_hoc_command_events'
     view_name = _('Ad Hoc Command Events List')
+    search_fields = ('stdout',)
 
 
 class HostAdHocCommandEventsList(BaseAdHocCommandEventsList):
@@ -4596,6 +4643,7 @@ class AdHocCommandActivityStreamList(ActivityStreamEnforcementMixin, SubListAPIV
     serializer_class = ActivityStreamSerializer
     parent_model = AdHocCommand
     relationship = 'activitystream_set'
+    search_fields = ('changes',)
 
 
 class AdHocCommandNotificationsList(SubListAPIView):
@@ -4604,6 +4652,7 @@ class AdHocCommandNotificationsList(SubListAPIView):
     serializer_class = NotificationSerializer
     parent_model = AdHocCommand
     relationship = 'notifications'
+    search_fields = ('subject', 'notification_type', 'body',)
 
 
 class SystemJobList(ListCreateAPIView):
@@ -4644,6 +4693,7 @@ class SystemJobNotificationsList(SubListAPIView):
     serializer_class = NotificationSerializer
     parent_model = SystemJob
     relationship = 'notifications'
+    search_fields = ('subject', 'notification_type', 'body',)
 
 
 class UnifiedJobTemplateList(ListAPIView):
@@ -4849,6 +4899,7 @@ class NotificationTemplateNotificationList(SubListAPIView):
     parent_model = NotificationTemplate
     relationship = 'notifications'
     parent_key = 'notification_template'
+    search_fields = ('subject', 'notification_type', 'body',)
 
 
 class NotificationTemplateCopy(CopyAPIView):
@@ -4861,6 +4912,7 @@ class NotificationList(ListAPIView):
 
     model = Notification
     serializer_class = NotificationSerializer
+    search_fields = ('subject', 'notification_type', 'body',)
 
 
 class NotificationDetail(RetrieveAPIView):
@@ -4885,6 +4937,7 @@ class ActivityStreamList(ActivityStreamEnforcementMixin, SimpleListAPIView):
 
     model = ActivityStream
     serializer_class = ActivityStreamSerializer
+    search_fields = ('changes',)
 
 
 class ActivityStreamDetail(ActivityStreamEnforcementMixin, RetrieveAPIView):
@@ -4898,6 +4951,7 @@ class RoleList(ListAPIView):
     model = Role
     serializer_class = RoleSerializer
     permission_classes = (IsAuthenticated,)
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         result = Role.visible_roles(self.request.user)
@@ -5010,6 +5064,7 @@ class RoleParentsList(SubListAPIView):
     parent_model = Role
     relationship = 'parents'
     permission_classes = (IsAuthenticated,)
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         role = Role.objects.get(pk=self.kwargs['pk'])
@@ -5023,6 +5078,7 @@ class RoleChildrenList(SubListAPIView):
     parent_model = Role
     relationship = 'children'
     permission_classes = (IsAuthenticated,)
+    search_fields = ('role_field', 'content_type__model',)
 
     def get_queryset(self):
         role = Role.objects.get(pk=self.kwargs['pk'])
diff --git a/awx/main/tests/unit/test_views.py b/awx/main/tests/unit/test_views.py
index 6e3572dc7d..f1bad79400 100644
--- a/awx/main/tests/unit/test_views.py
+++ b/awx/main/tests/unit/test_views.py
@@ -3,6 +3,10 @@ import mock
 
 # Django REST Framework
 from rest_framework import exceptions
+from rest_framework.generics import ListAPIView
+
+# Django
+from django.core.urlresolvers import RegexURLResolver, RegexURLPattern
 
 # AWX
 from awx.main.views import ApiErrorView
@@ -52,3 +56,44 @@ def test_disable_post_on_v1_inventory_source_list(version, supports_post):
     inv_source_list.request = mock.MagicMock()
     with mock.patch('awx.api.views.get_request_version', return_value=version):
         assert ('POST' in inv_source_list.allowed_methods) == supports_post
+
+
+def test_views_have_search_fields():
+    from awx.api.urls import urlpatterns as api_patterns
+    patterns = set([])
+    url_views = set([])
+    # Add recursive URL patterns
+    unprocessed = set(api_patterns)
+    while unprocessed:
+        to_process = unprocessed.copy()
+        unprocessed = set([])
+        for pattern in to_process:
+            if hasattr(pattern, 'lookup_str') and not pattern.lookup_str.startswith('awx.api'):
+                continue
+            patterns.add(pattern)
+            if isinstance(pattern, RegexURLResolver):
+                for sub_pattern in pattern.url_patterns:
+                    if sub_pattern not in patterns:
+                        unprocessed.add(sub_pattern)
+    # Get view classes
+    for pattern in patterns:
+        if isinstance(pattern, RegexURLPattern) and hasattr(pattern.callback, 'view_class'):
+            cls = pattern.callback.view_class
+            if issubclass(cls, ListAPIView):
+                url_views.add(pattern.callback.view_class)
+
+    # Gather any views that don't have search fields defined
+    views_missing_search = []
+    for View in url_views:
+        view = View()
+        if not hasattr(view, 'search_fields') or len(view.search_fields) == 0:
+            views_missing_search.append(view)
+
+    if views_missing_search:
+        raise Exception('{} views do not have search fields defined:\n{}'.format(
+            len(views_missing_search),
+            '\n'.join([
+                v.__class__.__name__ + ' (model: {})'.format(getattr(v, 'model', type(None)).__name__)
+                for v in views_missing_search
+            ]))
+        )

From 503668141bdfcfaa3b6bd326b123687c47f444df Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Fri, 11 May 2018 22:59:45 -0400
Subject: [PATCH 131/169] add procedure for attaching to running jobs

---
 .../client/features/output/engine.service.js  | 10 +--
 .../features/output/index.controller.js       | 62 +++++++++++++++----
 .../client/features/output/status.service.js  | 22 +++++--
 awx/ui/client/lib/models/Base.js              |  8 +++
 4 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/awx/ui/client/features/output/engine.service.js b/awx/ui/client/features/output/engine.service.js
index 1f74a90c59..2e6371520f 100644
--- a/awx/ui/client/features/output/engine.service.js
+++ b/awx/ui/client/features/output/engine.service.js
@@ -38,6 +38,12 @@ function JobEventEngine ($q) {
         };
     };
 
+    this.setMinLine = min => {
+        if (min > this.lines.min) {
+            this.lines.min = min;
+        }
+    };
+
     this.getBatchFactors = size => {
         const factors = [1];
 
@@ -140,10 +146,6 @@ function JobEventEngine ($q) {
 
     this.renderFrame = events => this.hooks.onEventFrame(events)
         .then(() => {
-            if (this.scroll.isLocked()) {
-                this.scroll.scrollToBottom();
-            }
-
             if (this.isEnding()) {
                 const lastEvents = this.page.emptyBuffer();
 
diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js
index 5ba68bc8e6..5f5ba6b6eb 100644
--- a/awx/ui/client/features/output/index.controller.js
+++ b/awx/ui/client/features/output/index.controller.js
@@ -7,8 +7,10 @@ let resource;
 let scroll;
 let engine;
 let status;
+let $http;
 
 let vm;
+let streaming;
 let listeners = [];
 
 function JobsIndexController (
@@ -21,6 +23,7 @@ function JobsIndexController (
     _$compile_,
     _$q_,
     _status_,
+    _$http_,
 ) {
     vm = this || {};
 
@@ -34,6 +37,7 @@ function JobsIndexController (
     render = _render_;
     engine = _engine_;
     status = _status_;
+    $http = _$http_;
 
     // Development helper(s)
     vm.clear = devClear;
@@ -96,15 +100,8 @@ function init () {
         }
     });
 
-    if (!status.state.running) {
-        next();
-        return;
-    }
-
-    resource.model.get(`related.${resource.related}.results`)
-        .forEach(handleJobEvent);
-
-    startListening();
+    streaming = false;
+    return next().then(() => startListening());
 }
 
 function stopListening () {
@@ -123,12 +120,46 @@ function handleStatusEvent (data) {
 }
 
 function handleJobEvent (data) {
-    engine.pushJobEvent(data);
-    status.pushJobEvent(data);
+    streaming = streaming || attachToRunningJob();
+    streaming.then(() => {
+        engine.pushJobEvent(data);
+        status.pushJobEvent(data);
+    });
 }
 
-function devClear () {
-    render.clear().then(() => init());
+function attachToRunningJob () {
+    const target = `${resource.model.get('url')}${resource.related}/`;
+    const params = { order_by: '-created', page_size: resource.page.size };
+
+    scroll.pause();
+
+    return render.clear()
+        .then(() => $http.get(target, { params }))
+        .then(res => {
+            const { results } = res.data;
+
+            const minLine = 1 + Math.max(...results.map(event => event.end_line));
+            const maxCount = Math.max(...results.map(event => event.counter));
+
+            const lastPage = resource.model.updateCount(maxCount);
+
+            page.emptyCache(lastPage);
+            page.addPage(lastPage, [], true);
+
+            engine.setMinLine(minLine);
+
+            if (resource.model.page.current === lastPage) {
+                return $q.resolve();
+            }
+
+            return append(results);
+        })
+        .then(() => {
+            scroll.setScrollPosition(scroll.getScrollHeight());
+            scroll.resume();
+
+            return $q.resolve();
+        });
 }
 
 function next () {
@@ -294,6 +325,10 @@ function toggleExpanded () {
     vm.expanded = !vm.expanded;
 }
 
+function devClear () {
+    render.clear().then(() => init());
+}
+
 // function showHostDetails (id) {
 //     jobEvent.request('get', id)
 //         .then(() => {
@@ -344,6 +379,7 @@ JobsIndexController.$inject = [
     '$compile',
     '$q',
     'JobStatusService',
+    '$http',
 ];
 
 module.exports = JobsIndexController;
diff --git a/awx/ui/client/features/output/status.service.js b/awx/ui/client/features/output/status.service.js
index 12e3fd2544..a4e60c6822 100644
--- a/awx/ui/client/features/output/status.service.js
+++ b/awx/ui/client/features/output/status.service.js
@@ -49,48 +49,60 @@ function JobStatusService (moment, message) {
     };
 
     this.pushStatusEvent = data => {
-        const isJobEvent = (this.job === data.unified_job_id);
-        const isProjectEvent = (this.project && (this.project === data.project_id));
+        const isJobStatusEvent = (this.job === data.unified_job_id);
+        const isProjectStatusEvent = (this.project && (this.project === data.project_id));
 
-        if (isJobEvent) {
+        if (isJobStatusEvent) {
             this.setJobStatus(data.status);
-        } else if (isProjectEvent) {
+            this.dispatch();
+        } else if (isProjectStatusEvent) {
             this.setProjectStatus(data.status);
             this.setProjectUpdateId(data.unified_job_id);
+            this.dispatch();
         }
     };
 
     this.pushJobEvent = data => {
         const isLatest = ((!this.counter) || (data.counter > this.counter));
 
+        let changed = false;
+
         if (!this.active && !(data.event === JOB_END)) {
             this.active = true;
             this.setJobStatus('running');
+            changed = true;
         }
 
         if (isLatest) {
             this.counter = data.counter;
             this.latestTime = data.created;
             this.setElapsed(moment(data.created).diff(this.created, 'seconds'));
+            changed = true;
         }
 
         if (data.event === JOB_START) {
             this.setStarted(this.state.started || data.created);
+            changed = true;
         }
 
         if (data.event === PLAY_START) {
             this.state.counts.plays++;
+            changed = true;
         }
 
         if (data.event === TASK_START) {
             this.state.counts.tasks++;
+            changed = true;
         }
 
         if (data.event === JOB_END) {
             this.setStatsEvent(data);
+            changed = true;
         }
 
-        this.dispatch();
+        if (changed) {
+            this.dispatch();
+        }
     };
 
     this.isExpectingStatsEvent = () => (this.jobType === 'job') ||
diff --git a/awx/ui/client/lib/models/Base.js b/awx/ui/client/lib/models/Base.js
index 912d9a984c..a7cc321806 100644
--- a/awx/ui/client/lib/models/Base.js
+++ b/awx/ui/client/lib/models/Base.js
@@ -398,6 +398,13 @@ function extend (method, related, config = {}) {
     return Promise.reject(new Error(`No related property, ${related}, exists`));
 }
 
+function updateCount (count) {
+    this.page.count = count;
+    this.page.last = Math.ceil(count / this.page.size);
+
+    return this.page.last;
+}
+
 function goToPage (config) {
     const params = config.params || {};
     const { page } = config;
@@ -693,6 +700,7 @@ function BaseModel (resource, settings) {
     this.extend = extend;
     this.copy = copy;
     this.getDependentResourceCounts = getDependentResourceCounts;
+    this.updateCount = updateCount;
 
     this.http = {
         get: httpGet.bind(this),

From 3d157fab47533a566eb315196cf0bfb973a4c206 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Mon, 14 May 2018 11:26:46 -0400
Subject: [PATCH 132/169] change default option text for ansible environment
 dropdown to Default Environment

---
 awx/ui/client/src/organizations/organizations.form.js          | 2 +-
 awx/ui/client/src/projects/projects.form.js                    | 2 +-
 awx/ui/client/src/templates/job_templates/job-template.form.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/src/organizations/organizations.form.js b/awx/ui/client/src/organizations/organizations.form.js
index c6744f3dc6..79d8098afe 100644
--- a/awx/ui/client/src/organizations/organizations.form.js
+++ b/awx/ui/client/src/organizations/organizations.form.js
@@ -45,7 +45,7 @@ export default ['NotificationsList', 'i18n',
                 },
                 custom_virtualenv: {
                     label: i18n._('Ansible Environment'),
-                    defaultText: i18n._('Select Ansible Environment'),
+                    defaultText: i18n._('Default Environment'),
                     type: 'select',
                     ngOptions: 'venv for venv in custom_virtualenvs_options track by venv',
                     awPopOver: "<p>" + i18n._("Select the custom Python virtual environment for this organization to run on.") + "</p>",
diff --git a/awx/ui/client/src/projects/projects.form.js b/awx/ui/client/src/projects/projects.form.js
index 1862f28722..6b0454a1bc 100644
--- a/awx/ui/client/src/projects/projects.form.js
+++ b/awx/ui/client/src/projects/projects.form.js
@@ -206,7 +206,7 @@ export default ['i18n', 'NotificationsList', 'TemplateList',
             custom_virtualenv: {
                 label: i18n._('Ansible Environment'),
                 type: 'select',
-                defaultText: i18n._('Select Ansible Environment'),
+                defaultText: i18n._('Default Environment'),
                 ngOptions: 'venv for venv in custom_virtualenvs_options track by venv',
                 awPopOver: "<p>" + i18n._("Select the custom Python virtual environment for this project to run on.") + "</p>",
                 dataTitle: i18n._('Ansible Environment'),
diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js
index 31174ac043..a3f83954f1 100644
--- a/awx/ui/client/src/templates/job_templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job_templates/job-template.form.js
@@ -234,7 +234,7 @@ function(NotificationsList, i18n) {
                 custom_virtualenv: {
                     label: i18n._('Ansible Environment'),
                     type: 'select',
-                    defaultText: i18n._('Select Ansible Environment'),
+                    defaultText: i18n._('Default Environment'),
                     ngOptions: 'venv for venv in custom_virtualenvs_options track by venv',
                     awPopOver: "<p>" + i18n._("Select the custom Python virtual environment for this job template to run on.") + "</p>",
                     dataTitle: i18n._('Ansible Environment'),

From bb3b19e17480effdd12712b768c2ef972c60f1c4 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Mon, 14 May 2018 13:59:44 -0400
Subject: [PATCH 133/169] truncate certain event fields when they are overly
 long

see: https://github.com/ansible/tower/issues/1775
---
 awx/main/models/events.py                 | 38 ++++++++++++++---------
 awx/main/tests/unit/models/test_events.py | 15 +++++++++
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/awx/main/models/events.py b/awx/main/models/events.py
index 21dcd90a24..a6e2c67c74 100644
--- a/awx/main/models/events.py
+++ b/awx/main/models/events.py
@@ -4,9 +4,11 @@ import logging
 from django.conf import settings
 from django.db import models, DatabaseError
 from django.utils.dateparse import parse_datetime
+from django.utils.text import Truncator
 from django.utils.timezone import utc
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import force_text
+import six
 
 from awx.api.versioning import reverse
 from awx.main.fields import JSONField
@@ -22,6 +24,22 @@ __all__ = ['JobEvent', 'ProjectUpdateEvent', 'AdHocCommandEvent',
            'InventoryUpdateEvent', 'SystemJobEvent']
 
 
+def sanitize_event_keys(kwargs, valid_keys):
+    # Sanity check: Don't honor keys that we don't recognize.
+    for key in kwargs.keys():
+        if key not in valid_keys:
+            kwargs.pop(key)
+
+    # Truncate certain values over 1k
+    for key in [
+        'play', 'role', 'task', 'playbook'
+    ]:
+        if isinstance(kwargs.get(key), six.string_types):
+            if len(kwargs[key]) > 1024:
+                kwargs[key] = Truncator(kwargs[key]).chars(1024)
+
+
+
 class BasePlaybookEvent(CreatedModifiedModel):
     '''
     An event/message logged from a playbook callback for each host.
@@ -257,7 +275,7 @@ class BasePlaybookEvent(CreatedModifiedModel):
         return updated_fields
 
     @classmethod
-    def create_from_data(self, **kwargs):
+    def create_from_data(cls, **kwargs):
         pk = None
         for key in ('job_id', 'project_update_id'):
             if key in kwargs:
@@ -279,12 +297,8 @@ class BasePlaybookEvent(CreatedModifiedModel):
         except (KeyError, ValueError):
             kwargs.pop('created', None)
 
-        # Sanity check: Don't honor keys that we don't recognize.
-        for key in kwargs.keys():
-            if key not in self.VALID_KEYS:
-                kwargs.pop(key)
-
-        job_event = self.objects.create(**kwargs)
+        sanitize_event_keys(kwargs, cls.VALID_KEYS)
+        job_event = cls.objects.create(**kwargs)
         analytics_logger.info('Event data saved.', extra=dict(python_objects=dict(job_event=job_event)))
         return job_event
 
@@ -551,7 +565,7 @@ class BaseCommandEvent(CreatedModifiedModel):
         return u'%s @ %s' % (self.get_event_display(), self.created.isoformat())
 
     @classmethod
-    def create_from_data(self, **kwargs):
+    def create_from_data(cls, **kwargs):
         # Convert the datetime for the event's creation
         # appropriately, and include a time zone for it.
         #
@@ -565,12 +579,8 @@ class BaseCommandEvent(CreatedModifiedModel):
         except (KeyError, ValueError):
             kwargs.pop('created', None)
 
-        # Sanity check: Don't honor keys that we don't recognize.
-        for key in kwargs.keys():
-            if key not in self.VALID_KEYS:
-                kwargs.pop(key)
-
-        return self.objects.create(**kwargs)
+        sanitize_event_keys(kwargs, cls.VALID_KEYS)
+        return cls.objects.create(**kwargs)
 
     def get_event_display(self):
         '''
diff --git a/awx/main/tests/unit/models/test_events.py b/awx/main/tests/unit/models/test_events.py
index 71be98a167..47a7f30c55 100644
--- a/awx/main/tests/unit/models/test_events.py
+++ b/awx/main/tests/unit/models/test_events.py
@@ -44,3 +44,18 @@ def test_playbook_event_strip_invalid_keys(job_identifier, cls):
             'extra_key': 'extra_value'
         })
         manager.create.assert_called_with(**{job_identifier: 123})
+
+
+@pytest.mark.parametrize('field', [
+    'play', 'role', 'task', 'playbook'
+])
+def test_really_long_event_fields(field):
+    with mock.patch.object(JobEvent, 'objects') as manager:
+        JobEvent.create_from_data(**{
+            'job_id': 123,
+            field: 'X' * 4096
+        })
+        manager.create.assert_called_with(**{
+            'job_id': 123,
+            field: 'X' * 1021 + '...'
+        })

From 5b55e3cb2bc426f75e7f7363346d210b2ccfcc4f Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Mon, 14 May 2018 13:14:33 -0400
Subject: [PATCH 134/169] fix a bug that prevented JT admins from editing
 custom virtualenvs

see: https://github.com/ansible/tower/issues/1754
---
 awx/api/views.py                              |  4 +++-
 awx/main/access.py                            |  1 +
 .../tests/functional/api/test_job_template.py | 22 +++++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/awx/api/views.py b/awx/api/views.py
index ff9b5d234a..52bad9c564 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -404,9 +404,11 @@ class ApiV1ConfigView(APIView):
             data.update(dict(
                 project_base_dir = settings.PROJECTS_ROOT,
                 project_local_paths = Project.get_local_path_choices(),
-                custom_virtualenvs = get_custom_venv_choices(),
             ))
 
+        if JobTemplate.accessible_objects(request.user, 'admin_role').exists():
+            data['custom_virtualenvs'] = get_custom_venv_choices()
+
         return Response(data)
 
     def post(self, request):
diff --git a/awx/main/access.py b/awx/main/access.py
index ce3ed5c9f5..8e0fe1c214 100644
--- a/awx/main/access.py
+++ b/awx/main/access.py
@@ -1366,6 +1366,7 @@ class JobTemplateAccess(BaseAccess):
             'job_tags', 'force_handlers', 'skip_tags', 'ask_variables_on_launch',
             'ask_tags_on_launch', 'ask_job_type_on_launch', 'ask_skip_tags_on_launch',
             'ask_inventory_on_launch', 'ask_credential_on_launch', 'survey_enabled',
+            'custom_virtualenv',
 
             # These fields are ignored, but it is convenient for QA to allow clients to post them
             'last_job_run', 'created', 'modified',
diff --git a/awx/main/tests/functional/api/test_job_template.py b/awx/main/tests/functional/api/test_job_template.py
index 3bd337f10f..0d9d1c8985 100644
--- a/awx/main/tests/functional/api/test_job_template.py
+++ b/awx/main/tests/functional/api/test_job_template.py
@@ -625,17 +625,31 @@ def test_save_survey_passwords_on_migration(job_template_with_survey_passwords):
 
 
 @pytest.mark.django_db
-def test_job_template_custom_virtualenv(get, patch, organization_factory, job_template_factory):
+@pytest.mark.parametrize('access', ["superuser", "admin", "peon"])
+def test_job_template_custom_virtualenv(get, patch, organization_factory, job_template_factory, alice, access):
     objs = organization_factory("org", superusers=['admin'])
     jt = job_template_factory("jt", organization=objs.organization,
                               inventory='test_inv', project='test_proj').job_template
 
+    user = alice
+    if access == "superuser":
+        user = objs.superusers.admin
+    elif access == "admin":
+        jt.admin_role.members.add(alice)
+    else:
+        jt.read_role.members.add(alice)
+
     with TemporaryDirectory(dir=settings.BASE_VENV_PATH) as temp_dir:
-        admin = objs.superusers.admin
         os.makedirs(os.path.join(temp_dir, 'bin', 'activate'))
         url = reverse('api:job_template_detail', kwargs={'pk': jt.id})
-        patch(url, {'custom_virtualenv': temp_dir}, user=admin, expect=200)
-        assert get(url, user=admin).data['custom_virtualenv'] == os.path.join(temp_dir, '')
+
+        if access == "peon":
+            patch(url, {'custom_virtualenv': temp_dir}, user=user, expect=403)
+            assert 'custom_virtualenv' not in get(url, user=user)
+            assert JobTemplate.objects.get(pk=jt.id).custom_virtualenv is None
+        else:
+            patch(url, {'custom_virtualenv': temp_dir}, user=user, expect=200)
+            assert get(url, user=user).data['custom_virtualenv'] == os.path.join(temp_dir, '')
 
 
 @pytest.mark.django_db

From ef514fb3c06a9de737f5390477765d30b1ddf435 Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 14 May 2018 14:28:52 -0400
Subject: [PATCH 135/169] Mitigated race condition issues with limit-panel
 directive by removing dependency on the state transition event

---
 .../limit-panels/limit-panels.directive.js    | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/awx/ui/client/src/shared/limit-panels/limit-panels.directive.js b/awx/ui/client/src/shared/limit-panels/limit-panels.directive.js
index c4423d6cca..2471a1cf29 100644
--- a/awx/ui/client/src/shared/limit-panels/limit-panels.directive.js
+++ b/awx/ui/client/src/shared/limit-panels/limit-panels.directive.js
@@ -1,4 +1,4 @@
-export default ['$rootScope', '$transitions', function($rootScope, $transitions) {
+export default [function() {
     return {
         restrict: 'E',
         scope: {
@@ -7,27 +7,28 @@ export default ['$rootScope', '$transitions', function($rootScope, $transitions)
         },
         link: function(scope) {
 
-            scope.maxPanels = parseInt(scope.maxPanels);
+            const maxPanels = parseInt(scope.maxPanels);
 
-            $transitions.onSuccess({}, function() {
-                let panels = angular.element('#' + scope.panelContainer).find('.Panel');
-
-                if(panels.length > scope.maxPanels) {
-                    // hide the excess panels
-                    $(panels).each(function( index ) {
-                        if(index+1 > scope.maxPanels) {
-                            $(this).addClass('Panel-hidden');
-                        }
-                        else {
-                            $(this).removeClass('Panel-hidden');
-                        }
-                    });
+            scope.$watch(
+                () => angular.element('#' + scope.panelContainer).find('.Panel').length,
+                () => {
+                    const panels = angular.element('#' + scope.panelContainer).find('.Panel');
+                    if(panels.length > maxPanels) {
+                        // hide the excess panels
+                        $(panels).each(function( index ) {
+                            if(index+1 > maxPanels) {
+                                $(this).addClass('Panel-hidden');
+                            }
+                            else {
+                                $(this).removeClass('Panel-hidden');
+                            }
+                        });
+                    } else {
+                        // show all the panels
+                        $(panels).removeClass('Panel-hidden');
+                    }
                 }
-                else {
-                    // show all the panels
-                    $(panels).removeClass('Panel-hidden');
-                }
-            });
+            );
         }
     };
 }];

From 1a9b60a1998145b0bba4d5943b66a1f7cf9526fa Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 14 May 2018 14:55:32 -0400
Subject: [PATCH 136/169] Delete the survey if the user removes all the survey
 questions

---
 .../src/partials/survey-maker-modal.html      |  2 +-
 .../survey-maker/surveys/add.factory.js       |  2 ++
 .../survey-maker/surveys/edit.factory.js      |  1 +
 .../survey-maker/surveys/init.factory.js      | 21 +++++++++++--------
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/awx/ui/client/src/partials/survey-maker-modal.html b/awx/ui/client/src/partials/survey-maker-modal.html
index 5385a14b28..c73a9dec77 100644
--- a/awx/ui/client/src/partials/survey-maker-modal.html
+++ b/awx/ui/client/src/partials/survey-maker-modal.html
@@ -84,7 +84,7 @@
                         <button id="survey-delete-button" class="btn btn-sm SurveyMaker-deleteButton" ng-show="survey_exists && (job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" ng-click="showDeleteOverlay('survey')" translate>DELETE SURVEY</button>
                         <button id="survey-close-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>CANCEL</button>
                         <button id="survey-close-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')" ng-show="!(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>CLOSE</button>
-                        <button id="survey-save-button" class="btn btn-sm Form-saveButton" ng-click="saveSurvey()" ng-disabled="survey_questions.length < 1 || !can_edit || editQuestionIndex !== null" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>SAVE</button>
+                        <button id="survey-save-button" class="btn btn-sm Form-saveButton" ng-click="saveSurvey()" ng-disabled="(!initiallyHadQuestions && survey_questions.length < 1) || !can_edit || editQuestionIndex !== null" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>SAVE</button>
                     </div>
                 </div>
             </div>
diff --git a/awx/ui/client/src/templates/survey-maker/surveys/add.factory.js b/awx/ui/client/src/templates/survey-maker/surveys/add.factory.js
index 3773e1ede9..51ac98c3fc 100644
--- a/awx/ui/client/src/templates/survey-maker/surveys/add.factory.js
+++ b/awx/ui/client/src/templates/survey-maker/surveys/add.factory.js
@@ -7,6 +7,8 @@ export default
             // modal title.  We want this toggle to be on by default
             scope.survey_enabled = true;
 
+            scope.initiallyHadQuestions = false;
+
             if (scope.removeDialogReady) {
                 scope.removeDialogReady();
             }
diff --git a/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js b/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js
index 790822e628..c40f4751d3 100644
--- a/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js
+++ b/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js
@@ -37,6 +37,7 @@ export default
                                 scope.survey_name = data.name;
                                 scope.survey_description = data.description;
                                 scope.survey_questions = data.spec;
+                                scope.initiallyHadQuestions = true;
                                 Wait('stop');
                             } else {
                                 AddSurvey({
diff --git a/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js b/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
index 3a13f4f70c..f3f7d09e84 100644
--- a/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
+++ b/awx/ui/client/src/templates/survey-maker/surveys/init.factory.js
@@ -109,15 +109,18 @@ export default
                     });
                 };
 
-                updateSurveyQuestions()
-                .then(function() {
-                    return updateSurveyEnabled();
-                })
-                .then(function() {
-                    scope.closeSurvey('survey-modal-dialog');
-                    scope.$emit('SurveySaved');
-                });
-
+                if (!scope.survey_questions || scope.survey_questions.length === 0) {
+                    scope.deleteSurvey();
+                } else {
+                    updateSurveyQuestions()
+                    .then(function() {
+                        return updateSurveyEnabled();
+                    })
+                    .then(function() {
+                        scope.closeSurvey('survey-modal-dialog');
+                        scope.$emit('SurveySaved');
+                    });
+                }
             };
 
             // Gets called when the user clicks the on/off toggle beside the survey modal title.

From bfc602ae106cd62e8cbe5a03f8b5ee77bf68d95f Mon Sep 17 00:00:00 2001
From: mabashian <mabashia@redhat.com>
Date: Mon, 14 May 2018 14:58:29 -0400
Subject: [PATCH 137/169] Changed variable names

---
 awx/ui/client/src/partials/survey-maker-modal.html              | 2 +-
 awx/ui/client/src/templates/survey-maker/surveys/add.factory.js | 2 +-
 .../client/src/templates/survey-maker/surveys/edit.factory.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/src/partials/survey-maker-modal.html b/awx/ui/client/src/partials/survey-maker-modal.html
index c73a9dec77..b6acbe2ab3 100644
--- a/awx/ui/client/src/partials/survey-maker-modal.html
+++ b/awx/ui/client/src/partials/survey-maker-modal.html
@@ -84,7 +84,7 @@
                         <button id="survey-delete-button" class="btn btn-sm SurveyMaker-deleteButton" ng-show="survey_exists && (job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" ng-click="showDeleteOverlay('survey')" translate>DELETE SURVEY</button>
                         <button id="survey-close-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>CANCEL</button>
                         <button id="survey-close-button" class="btn btn-sm Form-buttonDefault" ng-click="closeSurvey('survey-modal-dialog')" ng-show="!(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>CLOSE</button>
-                        <button id="survey-save-button" class="btn btn-sm Form-saveButton" ng-click="saveSurvey()" ng-disabled="(!initiallyHadQuestions && survey_questions.length < 1) || !can_edit || editQuestionIndex !== null" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>SAVE</button>
+                        <button id="survey-save-button" class="btn btn-sm Form-saveButton" ng-click="saveSurvey()" ng-disabled="(!isEditSurvey && survey_questions.length < 1) || !can_edit || editQuestionIndex !== null" ng-show="(job_template_obj.summary_fields.user_capabilities.edit || workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd)" translate>SAVE</button>
                     </div>
                 </div>
             </div>
diff --git a/awx/ui/client/src/templates/survey-maker/surveys/add.factory.js b/awx/ui/client/src/templates/survey-maker/surveys/add.factory.js
index 51ac98c3fc..eef26fa5d6 100644
--- a/awx/ui/client/src/templates/survey-maker/surveys/add.factory.js
+++ b/awx/ui/client/src/templates/survey-maker/surveys/add.factory.js
@@ -7,7 +7,7 @@ export default
             // modal title.  We want this toggle to be on by default
             scope.survey_enabled = true;
 
-            scope.initiallyHadQuestions = false;
+            scope.isEditSurvey = false;
 
             if (scope.removeDialogReady) {
                 scope.removeDialogReady();
diff --git a/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js b/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js
index c40f4751d3..90d2c734ce 100644
--- a/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js
+++ b/awx/ui/client/src/templates/survey-maker/surveys/edit.factory.js
@@ -37,7 +37,7 @@ export default
                                 scope.survey_name = data.name;
                                 scope.survey_description = data.description;
                                 scope.survey_questions = data.spec;
-                                scope.initiallyHadQuestions = true;
+                                scope.isEditSurvey = true;
                                 Wait('stop');
                             } else {
                                 AddSurvey({

From 357a735e56abfb63a4449c95a43afe74d59663f8 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Mon, 14 May 2018 16:01:36 -0400
Subject: [PATCH 138/169] fix a bug that prevented JT admins from editing diff
 mode

see: https://github.com/ansible/tower/issues/801
---
 awx/main/access.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/main/access.py b/awx/main/access.py
index 8e0fe1c214..67bb01905d 100644
--- a/awx/main/access.py
+++ b/awx/main/access.py
@@ -1366,7 +1366,7 @@ class JobTemplateAccess(BaseAccess):
             'job_tags', 'force_handlers', 'skip_tags', 'ask_variables_on_launch',
             'ask_tags_on_launch', 'ask_job_type_on_launch', 'ask_skip_tags_on_launch',
             'ask_inventory_on_launch', 'ask_credential_on_launch', 'survey_enabled',
-            'custom_virtualenv',
+            'custom_virtualenv', 'diff_mode',
 
             # These fields are ignored, but it is convenient for QA to allow clients to post them
             'last_job_run', 'created', 'modified',

From e04b2b74557c1dfdf71a3f344a7a8e6b4a9a306e Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Mon, 14 May 2018 17:17:24 -0700
Subject: [PATCH 139/169] Fixes breadcrumbs for all the schedule states

---
 .../related/sources/edit/sources-edit.controller.js |  1 +
 .../related/sources/edit/sources-edit.route.js      |  2 +-
 .../list/schedule/sources-schedule-edit.route.js    |  4 ++--
 .../src/projects/edit/projects-edit.controller.js   |  1 +
 awx/ui/client/src/projects/main.js                  |  3 +++
 .../src/scheduler/schedulerEdit.controller.js       |  2 ++
 awx/ui/client/src/scheduler/schedules.route.js      | 13 +++----------
 .../job-template-edit.controller.js                 |  1 +
 awx/ui/client/src/templates/main.js                 |  6 ++++++
 .../edit-workflow/workflow-edit.controller.js       |  1 +
 10 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js
index 104ff2574a..eb3c083cd4 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.controller.js
@@ -33,6 +33,7 @@ export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
             {verbosity: inventorySourceData.verbosity});
 
         $scope.inventory_source_obj = inventorySourceData;
+        $scope.breadcrumb.inventory_source_name = inventorySourceData.name;
         if (inventorySourceData.credential) {
             $scope.credential_name = inventorySourceData.summary_fields.credential.name;
         }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js
index 2402b9fb08..2663478a18 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js
@@ -5,7 +5,7 @@ export default {
     url: "/edit/:inventory_source_id",
     ncyBreadcrumb: {
         parent: "inventories.edit.inventory_sources",
-        label: N_("INVENTORY SOURCES")
+        label: '{{breadcrumb.inventory_source_name}}'
     },
     views: {
         'groupForm@inventories': {
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js
index 52021fc34d..2c956fd6cd 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/schedule/sources-schedule-edit.route.js
@@ -5,8 +5,8 @@ export default {
     name: 'inventories.edit.inventory_sources.edit.schedules.edit',
     url: '/:schedule_id',
     ncyBreadcrumb: {
-        parent: "inventories.edit.inventory_sources.edit.schedules",
-        label: "{{schedule_obj.name}}"
+        parent: 'inventories.edit.inventory_sources.edit.schedules',
+        label: "{{breadcrumb.schedule_name}}"
     },
     views: {
         'scheduler@inventories': {
diff --git a/awx/ui/client/src/projects/edit/projects-edit.controller.js b/awx/ui/client/src/projects/edit/projects-edit.controller.js
index 2aa9434c15..8f28ac1b79 100644
--- a/awx/ui/client/src/projects/edit/projects-edit.controller.js
+++ b/awx/ui/client/src/projects/edit/projects-edit.controller.js
@@ -156,6 +156,7 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
 
                     $scope.project_obj = data;
                     $scope.name = data.name;
+                    $scope.breadcrumb.project_name = data.name;
                     $scope.$emit('projectLoaded');
                     Wait('stop');
                 })
diff --git a/awx/ui/client/src/projects/main.js b/awx/ui/client/src/projects/main.js
index d8aaf9df36..144fb99b91 100644
--- a/awx/ui/client/src/projects/main.js
+++ b/awx/ui/client/src/projects/main.js
@@ -91,6 +91,9 @@ angular.module('Projects', [])
                     ncyBreadcrumb: {
                         label: N_('PROJECTS')
                     },
+                    breadcrumbs: {
+                        edit: '{{breadcrumb.project_name}}'
+                    },
                     resolve: {
                         add: projectResolve,
                         edit: projectResolve
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index 14fcf921f7..16a4bf19cb 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -223,6 +223,8 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
         $scope.showRRuleDetail = false;
         scheduler.setRRule(schedule.rrule);
         scheduler.setName(schedule.name);
+        $rootScope.breadcrumb.schedule_name = $scope.schedulerName;
+        $rootScope.breadcrumb[`${$scope.parentObject.type}_name`] = $scope.parentObject.name;
         scheduler.scope.timeZones = timezonesResolve;
         scheduler.scope.schedulerTimeZone = scheduleResolve.timezone;
         if ($scope.cleanupJob){
diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js
index 75f61ca009..00882ec03c 100644
--- a/awx/ui/client/src/scheduler/schedules.route.js
+++ b/awx/ui/client/src/scheduler/schedules.route.js
@@ -12,7 +12,6 @@ const jobTemplatesSchedulesListRoute = {
         activityStreamId: 'id'
     },
     ncyBreadcrumb: {
-        parent: 'templates.editJobTemplate({job_template_id: parentObject.id})',
         label: N_('SCHEDULES')
     },
     resolve: {
@@ -72,7 +71,6 @@ const jobTemplatesSchedulesAddRoute = {
         }
     },
     ncyBreadcrumb: {
-        parent: 'templates.editJobTemplate({job_template_id: parentObject.id})',
         label: N_('CREATE SCHEDULE')
     }
 };
@@ -87,8 +85,7 @@ const jobTemplatesSchedulesEditRoute = {
         }
     },
     ncyBreadcrumb: {
-        parent: 'templates.editJobTemplate({job_template_id: parentObject.id})',
-        label: '{{schedule_obj.name}}'
+        label: "{{breadcrumb.schedule_name}}"
     },
     resolve: editScheduleResolve()
 };
@@ -104,7 +101,6 @@ const workflowSchedulesRoute = {
         activityStreamId: 'id'
     },
     ncyBreadcrumb: {
-        parent: 'templates.editWorkflowJobTemplate({workflow_job_template_id: parentObject.id})',
         label: N_('SCHEDULES')
     },
     resolve: {
@@ -164,7 +160,6 @@ const workflowSchedulesAddRoute = {
         }
     },
     ncyBreadcrumb: {
-        parent: 'templates.editWorkflowJobTemplate({workflow_job_template_id: parentObject.id})',
         label: N_('CREATE SCHEDULE')
     }
 };
@@ -179,8 +174,7 @@ const workflowSchedulesEditRoute = {
         }
     },
     ncyBreadcrumb: {
-        parent: 'templates.editWorkflowJobTemplate({workflow_job_template_id: parentObject.id})',
-        label: '{{schedule_obj.name}}'
+        label: '{{breadcrumb.schedule_name}}'
     },
     resolve: editScheduleResolve()
 };
@@ -195,7 +189,6 @@ const projectsSchedulesListRoute = {
         activityStreamId: 'id'
     },
     ncyBreadcrumb: {
-        parent: 'projects.edit({project_id: parentObject.id})',
         label: N_('SCHEDULES')
     },
     resolve: {
@@ -263,7 +256,7 @@ const projectsSchedulesEditRoute = {
     name: 'projects.edit.schedules.edit',
     route: '/:schedule_id',
     ncyBreadcrumb: {
-        label: '{{schedule_obj.name}}'
+        label: "{{breadcrumb.schedule_name}}"
     },
     views: {
         'scheduler@projects': {
diff --git a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
index a5a6a23946..85bc0882a2 100644
--- a/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
+++ b/awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
@@ -278,6 +278,7 @@ export default
             $scope.removeLoadJobs = $scope.$on('LoadJobs', function() {
                 $scope.job_template_obj = jobTemplateData;
                 $scope.name = jobTemplateData.name;
+                $scope.breadcrumb.job_template_name = jobTemplateData.name;
                 var fld, i;
                 for (fld in form.fields) {
                     if (fld !== 'extra_vars' && fld !== 'survey' && fld !== 'forks' && jobTemplateData[fld] !== null && jobTemplateData[fld] !== undefined) {
diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js
index 7b05bde077..4bb8a15b49 100644
--- a/awx/ui/client/src/templates/main.js
+++ b/awx/ui/client/src/templates/main.js
@@ -164,6 +164,9 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
                         activityStreamTarget: 'job_template',
                         activityStreamId: 'job_template_id'
                     },
+                    breadcrumbs: {
+                        edit: '{{breadcrumb.job_template_name}}'
+                    },
                     resolve: {
                         edit: {
                             jobTemplateData: ['$stateParams', 'TemplatesService', 'ProcessErrors',
@@ -346,6 +349,9 @@ angular.module('templates', [surveyMaker.name, jobTemplates.name, labels.name, p
                         activityStreamTarget: 'workflow_job_template',
                         activityStreamId: 'workflow_job_template_id'
                     },
+                    breadcrumbs: {
+                        edit: '{{breadcrumb.workflow_job_template_name}}'
+                    },
                     resolve: {
                         edit: {
                             availableLabels: ['Rest', '$stateParams', 'GetBasePath', 'ProcessErrors', 'TemplatesService',
diff --git a/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js b/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
index 4d1bc567a7..0ef57520d9 100644
--- a/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
+++ b/awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js
@@ -264,6 +264,7 @@ export default [
         $scope.workflow_job_template_obj = workflowJobTemplateData;
         $scope.name = workflowJobTemplateData.name;
         $scope.can_edit = workflowJobTemplateData.summary_fields.user_capabilities.edit;
+        $scope.breadcrumb.workflow_job_template_name = $scope.name;
         let fld, i;
         for (fld in form.fields) {
             if (fld !== 'variables' && fld !== 'survey' && workflowJobTemplateData[fld] !== null && workflowJobTemplateData[fld] !== undefined) {

From 8f3cc4ec3ef2597dd74bcf65fda7a207c10b0017 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Mon, 14 May 2018 17:54:30 -0700
Subject: [PATCH 140/169] Addes a /#/jobs/schedules/:schedule_id/ route to the
 app

To leave user in the context of jobs/schedules when editing
a schedule instead of putting them in the context of the resource
they're scheduling
---
 awx/ui/client/features/jobs/index.js          |  3 +-
 awx/ui/client/features/jobs/index.view.html   |  5 +-
 .../sources/edit/sources-edit.route.js        |  2 -
 .../src/scheduler/editSchedule.resolve.js     |  1 -
 .../src/scheduler/schedulerList.controller.js | 71 +------------------
 .../client/src/scheduler/schedules.route.js   | 21 +++++-
 6 files changed, 25 insertions(+), 78 deletions(-)

diff --git a/awx/ui/client/features/jobs/index.js b/awx/ui/client/features/jobs/index.js
index 5c244cd88a..8bb692f0c8 100644
--- a/awx/ui/client/features/jobs/index.js
+++ b/awx/ui/client/features/jobs/index.js
@@ -1,6 +1,6 @@
 import JobsStrings from './jobs.strings';
 import jobsRoute from './routes/jobs.route';
-import { jobsSchedulesRoute } from '../../src/scheduler/schedules.route';
+import { jobsSchedulesRoute, jobsSchedulesEditRoute } from '../../src/scheduler/schedules.route';
 
 const MODULE_NAME = 'at.features.jobs';
 
@@ -10,6 +10,7 @@ angular
     .run(['$stateExtender', ($stateExtender) => {
         $stateExtender.addState(jobsRoute);
         $stateExtender.addState(jobsSchedulesRoute);
+        $stateExtender.addState(jobsSchedulesEditRoute);
     }]);
 
 export default MODULE_NAME;
diff --git a/awx/ui/client/features/jobs/index.view.html b/awx/ui/client/features/jobs/index.view.html
index 054e26c2ba..04b176d8ac 100644
--- a/awx/ui/client/features/jobs/index.view.html
+++ b/awx/ui/client/features/jobs/index.view.html
@@ -1,13 +1,14 @@
+<div ui-view="scheduler"></div>
 <div class="tab-pane" id="jobs-page">
     <at-panel ng-cloak id="htmlTemplate">
         <div>
-            <div ng-hide="$state.is('jobs.schedules')">
+            <div ng-hide="$state.is('jobs.schedules') || $state.is('jobs.schedules.edit')">
                 <at-panel-heading hide-dismiss="true">
                     <translate>JOBS</translate>
                 </at-panel-heading>
                 <div ui-view="jobsList"></div>
             </div>
-            <div ng-hide="!$state.is('jobs.schedules')">
+            <div ng-hide="!$state.is('jobs.schedules') && !$state.is('jobs.schedules.edit')">
                 <at-panel-heading hide-dismiss="true">
                     <translate>SCHEDULES</translate>
                 </at-panel-heading>
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js
index 2663478a18..dbc2337357 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/edit/sources-edit.route.js
@@ -1,5 +1,3 @@
-import { N_ } from '../../../../../i18n';
-
 export default {
     name: "inventories.edit.inventory_sources.edit",
     url: "/edit/:inventory_source_id",
diff --git a/awx/ui/client/src/scheduler/editSchedule.resolve.js b/awx/ui/client/src/scheduler/editSchedule.resolve.js
index 9d6e777896..f65dc17b9c 100644
--- a/awx/ui/client/src/scheduler/editSchedule.resolve.js
+++ b/awx/ui/client/src/scheduler/editSchedule.resolve.js
@@ -3,7 +3,6 @@ function editScheduleResolve () {
         scheduleResolve: ['Rest', '$stateParams', 'GetBasePath', 'ProcessErrors',
             (Rest, $stateParams, GetBasePath, ProcessErrors) => {
                 var path = `${GetBasePath('schedules')}${parseInt($stateParams.schedule_id)}/`;
-                // const path = GetBasePath('schedules') + parseInt($stateParams.schedule_id) + '/');
                 Rest.setUrl(path);
                 return Rest.get()
                     .then(function(data) {
diff --git a/awx/ui/client/src/scheduler/schedulerList.controller.js b/awx/ui/client/src/scheduler/schedulerList.controller.js
index f7f21df662..e09566a797 100644
--- a/awx/ui/client/src/scheduler/schedulerList.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerList.controller.js
@@ -144,7 +144,7 @@ export default [
 
         $scope.editSchedule = function(schedule) {
             if ($state.is('jobs.schedules')){
-                routeToScheduleForm(schedule, 'edit');
+                $state.go('jobs.schedules.edit', {schedule_id: schedule.id});
             }
             else {
                 if($state.current.name.endsWith('.add')) {
@@ -157,75 +157,6 @@ export default [
                     $state.go('.edit', { schedule_id: schedule.id });
                 }
             }
-
-            function buildStateMap(schedule){
-
-                let deferred = $q.defer();
-
-                switch(schedule.summary_fields.unified_job_template.unified_job_type){
-                case 'job':
-                    deferred.resolve({
-                        name: 'templates.editJobTemplate.schedules.edit',
-                        params: {
-                            job_template_id: schedule.unified_job_template,
-                            schedule_id: schedule.id
-                        }
-                    });
-                    break;
-
-                    case 'workflow_job':
-                        deferred.resolve({
-                            name: 'templates.editWorkflowJobTemplate.schedules.edit',
-                            params: {
-                                workflow_job_template_id: schedule.unified_job_template,
-                                schedule_id: schedule.id
-                            }
-                        });
-                        break;
-
-                    case 'inventory_update':
-                        Rest.setUrl(schedule.related.unified_job_template);
-                        Rest.get().then( (res) => {
-                            deferred.resolve({
-                                name: 'inventories.edit.inventory_sources.edit.schedules.edit',
-                                params: {
-                                    inventory_source_id: res.data.id,
-                                    inventory_id: res.data.inventory,
-                                    schedule_id: schedule.id,
-                                }
-                            });
-                        });
-                        break;
-
-                    case 'project_update':
-                        deferred.resolve({
-                            name: 'projects.edit.schedules.edit',
-                            params: {
-                                project_id: schedule.unified_job_template,
-                                schedule_id: schedule.id
-                            }
-                        });
-                        break;
-
-                    case 'system_job':
-                        deferred.resolve({
-                            name: 'managementJobsList.schedule.edit',
-                            params: {
-                                id: schedule.unified_job_template,
-                                schedule_id: schedule.id
-                            }
-                        });
-                        break;
-                }
-
-                return deferred.promise;
-            }
-
-            function routeToScheduleForm(schedule){
-                buildStateMap(schedule).then((state) =>{
-                    $state.go(state.name, state.params);
-                });
-            }
         };
 
         $scope.toggleSchedule = function(event, id) {
diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js
index 00882ec03c..b1c89ac24e 100644
--- a/awx/ui/client/src/scheduler/schedules.route.js
+++ b/awx/ui/client/src/scheduler/schedules.route.js
@@ -285,7 +285,7 @@ const jobsSchedulesRoute = {
     },
     ncyBreadcrumb: {
         parent: 'jobs',
-        label: N_('SCHEDULED')
+        label: N_('SCHEDULES')
     },
     resolve: {
         ScheduleList: ['ScheduledJobsList', function(list){
@@ -326,6 +326,22 @@ const jobsSchedulesRoute = {
     }
 };
 
+const jobsSchedulesEditRoute = {
+    name: 'jobs.schedules.edit',
+    route: '/:schedule_id',
+    ncyBreadcrumb: {
+        parent: 'jobs.schedules',
+        label: "{{breadcrumb.schedule_name}}"
+    },
+    views: {
+        'scheduler@jobs': {
+            controller: 'schedulerEditController',
+            templateUrl: templateUrl("scheduler/schedulerForm"),
+        }
+    },
+    resolve: editScheduleResolve()
+};
+
 export {
     jobTemplatesSchedulesListRoute,
     jobTemplatesSchedulesAddRoute,
@@ -336,5 +352,6 @@ export {
     projectsSchedulesListRoute,
     projectsSchedulesAddRoute,
     projectsSchedulesEditRoute,
-    jobsSchedulesRoute
+    jobsSchedulesRoute,
+    jobsSchedulesEditRoute
 };

From 5006b84eee155d21f1faff2be551959b88607304 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Mon, 14 May 2018 18:34:07 -0700
Subject: [PATCH 141/169] adds parentResolve for new route

---
 .../src/scheduler/schedulerEdit.controller.js      |  8 +++++---
 awx/ui/client/src/scheduler/schedules.route.js     | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index 16a4bf19cb..f9d603fbd1 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -231,7 +231,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
             $scope.schedulerPurgeDays = Number(schedule.extra_data.days);
         }
 
-        if ($state.current.name === 'templates.editJobTemplate.schedules.edit'){
+        if ($state.current.name === 'templates.editJobTemplate.schedules.edit' || $scope.parentObject.type === 'job_template'){
 
             let jobTemplate = new JobTemplate();
 
@@ -380,7 +380,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
                         }
                     }
                 });
-        } else if ($state.current.name === 'templates.editWorkflowJobTemplate.schedules.edit') {
+        } else if ($state.current.name === 'templates.editWorkflowJobTemplate.schedules.edit' || $scope.parentObject.type === 'workflow_job_template') {
             let workflowJobTemplate = new WorkflowJobTemplate();
 
             $q.all([workflowJobTemplate.optionsLaunch(ParentObject.id), workflowJobTemplate.getLaunch(ParentObject.id)])
@@ -455,7 +455,9 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
         if ($state.current.name !== 'managementJobsList.schedule.add' && $state.current.name !== 'managementJobsList.schedule.edit'){
             if ($state.current.name === 'projects.edit.schedules.edit' ||
                 $state.current.name === 'inventories.edit.inventory_sources.edit.schedules.edit' ||
-                $state.current.name === 'templates.editWorkflowJobTemplate.schedules.add'
+                $state.current.name === 'templates.editWorkflowJobTemplate.schedules.add' ||
+                $scope.parentObject.type === 'inventory_source' ||
+                $scope.parentObject.type === 'project'
             ){
                 $scope.noVars = true;
             } else {
diff --git a/awx/ui/client/src/scheduler/schedules.route.js b/awx/ui/client/src/scheduler/schedules.route.js
index b1c89ac24e..965b42f97d 100644
--- a/awx/ui/client/src/scheduler/schedules.route.js
+++ b/awx/ui/client/src/scheduler/schedules.route.js
@@ -326,6 +326,18 @@ const jobsSchedulesRoute = {
     }
 };
 
+// the /#/jobs/schedules/:schedule_id state needs to know about the type of
+// resource is being scheduled.
+const parentResolve = {
+    ParentObject: ['$stateParams', 'Rest', 'GetBasePath', 'scheduleResolve',
+        function($stateParams, Rest, GetBasePath, scheduleResolve){
+            let path = scheduleResolve.related.unified_job_template;
+            Rest.setUrl(path);
+            return Rest.get(path).then(response => response.data);
+        }
+    ]
+};
+
 const jobsSchedulesEditRoute = {
     name: 'jobs.schedules.edit',
     route: '/:schedule_id',
@@ -339,7 +351,7 @@ const jobsSchedulesEditRoute = {
             templateUrl: templateUrl("scheduler/schedulerForm"),
         }
     },
-    resolve: editScheduleResolve()
+    resolve: _.merge(editScheduleResolve(), parentResolve)
 };
 
 export {

From c3d720cbd4196600e0267193266cb98c01d876ea Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@splat.cc>
Date: Tue, 15 May 2018 01:20:51 -0400
Subject: [PATCH 142/169] Fix checkout of role requirements.

'omit' is only special as a module argument, it cannot be used in this way.
Hence, just have two conditional tasks.
---
 awx/playbooks/project_update.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/awx/playbooks/project_update.yml b/awx/playbooks/project_update.yml
index d9067bac45..cefbdef1bb 100644
--- a/awx/playbooks/project_update.yml
+++ b/awx/playbooks/project_update.yml
@@ -139,8 +139,17 @@
         register: doesRequirementsExist
 
       - name: fetch galaxy roles from requirements.yml
-        command: ansible-galaxy install -r requirements.yml -p {{project_path|quote}}/roles/ {{ scm_result is defined|ternary('--force',omit) }}
+        command: ansible-galaxy install -r requirements.yml -p {{project_path|quote}}/roles/
         args:
           chdir: "{{project_path|quote}}/roles"
-        when: doesRequirementsExist.stat.exists
+        register: galaxy_result
+        when: doesRequirementsExist.stat.exists and scm_result is undefined
+        changed_when: "'was installed successfully' in galaxy_result.stdout"
+
+      - name: fetch galaxy roles from requirements.yml (forced update)
+        command: ansible-galaxy install -r requirements.yml -p {{project_path|quote}}/roles/ --force
+        args:
+          chdir: "{{project_path|quote}}/roles"
+        when: doesRequirementsExist.stat.exists and scm_result is defined
+
       when: scm_full_checkout|bool

From 5c45b25484cf88b4a509d5212d1fef38d64d66bc Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Tue, 15 May 2018 08:17:48 -0400
Subject: [PATCH 143/169] Prevent creating excessive update computed tasks when
 copying an Inventory

---
 awx/main/tasks.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 31edcc38d7..ccd633a065 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -2352,7 +2352,7 @@ def deep_copy_model_obj(
     except ObjectDoesNotExist:
         logger.warning("Object or user no longer exists.")
         return
-    with transaction.atomic():
+    with transaction.atomic(), ignore_inventory_computed_fields():
         copy_mapping = {}
         for sub_obj_setup in sub_obj_list:
             sub_model = getattr(importlib.import_module(sub_obj_setup[0]),
@@ -2372,3 +2372,5 @@ def deep_copy_model_obj(
                 importlib.import_module(permission_check_func[0]), permission_check_func[1]
             ), permission_check_func[2])
             permission_check_func(creater, copy_mapping.values())
+    if isinstance(new_obj, Inventory):
+        update_inventory_computed_fields.delay(new_obj.id, True)

From 05b0c5ec6f46d3555d6ea2e3fdabb259209a60f4 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 15 May 2018 09:16:37 -0400
Subject: [PATCH 144/169] censor OAuth tokens from activity stream deletion
 records

see: https://github.com/ansible/tower/issues/1772
---
 awx/main/signals.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/awx/main/signals.py b/awx/main/signals.py
index ea663eba39..86c798795d 100644
--- a/awx/main/signals.py
+++ b/awx/main/signals.py
@@ -494,6 +494,8 @@ def activity_stream_delete(sender, instance, **kwargs):
         return
     changes = model_to_dict(instance)
     object1 = camelcase_to_underscore(instance.__class__.__name__)
+    if type(instance) == OAuth2AccessToken:
+        changes['token'] = TOKEN_CENSOR
     activity_entry = ActivityStream(
         operation='delete',
         changes=json.dumps(changes),

From 6622e6bbd62ed9b866cad8a33c1f64ca61c407e0 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@splat.cc>
Date: Tue, 15 May 2018 11:24:27 -0400
Subject: [PATCH 145/169] Bump pexpect version on isolated node.

---
 requirements/requirements_isolated.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/requirements_isolated.txt b/requirements/requirements_isolated.txt
index 595ef46e3c..a7df0a2fa6 100644
--- a/requirements/requirements_isolated.txt
+++ b/requirements/requirements_isolated.txt
@@ -1,3 +1,3 @@
 psutil==5.4.3     # same as AWX requirement
-pexpect==4.4.0    # same as AWX requirement
+pexpect==4.5.0    # same as AWX requirement
 python-daemon==2.1.2

From 3ab7f06f952b3effb21d3000ae29f09b2e106477 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 15 May 2018 12:00:37 -0400
Subject: [PATCH 146/169] run scm inv syncs at the project root so relative
 imports work w/ bwrap

see: https://github.com/ansible/tower/issues/1357
---
 awx/main/management/commands/inventory_import.py | 3 +--
 awx/main/tasks.py                                | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py
index 3a03e66c53..021064a46b 100644
--- a/awx/main/management/commands/inventory_import.py
+++ b/awx/main/management/commands/inventory_import.py
@@ -135,8 +135,7 @@ class AnsibleInventoryLoader(object):
             self.tmp_private_dir = build_proot_temp_dir()
             logger.debug("Using fresh temporary directory '{}' for isolation.".format(self.tmp_private_dir))
             kwargs['proot_temp_dir'] = self.tmp_private_dir
-            # Run from source's location so that custom script contents are in `show_paths`
-            cwd = functioning_dir(self.source)
+            kwargs['proot_show_paths'] = [functioning_dir(self.source)]
         logger.debug("Running from `{}` working directory.".format(cwd))
 
         return wrap_args_with_proot(cmd, cwd, **kwargs)
diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index 72381076d9..f0c5adfef2 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -1720,6 +1720,10 @@ class RunInventoryUpdate(BaseTask):
     event_model = InventoryUpdateEvent
     event_data_key = 'inventory_update_id'
 
+    @property
+    def proot_show_paths(self):
+        return [self.get_path_to('..', 'plugins', 'inventory')]
+
     def build_private_data(self, inventory_update, **kwargs):
         """
         Return private data needed for inventory update.
@@ -2075,6 +2079,8 @@ class RunInventoryUpdate(BaseTask):
         return args
 
     def build_cwd(self, inventory_update, **kwargs):
+        if inventory_update.source == 'scm' and inventory_update.source_project_update:
+            return inventory_update.source_project_update.get_project_path(check_if_exists=False)
         return self.get_path_to('..', 'plugins', 'inventory')
 
     def get_idle_timeout(self):

From f3923af3facbe4b241973a4e92429db86bd8d574 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Tue, 15 May 2018 11:38:25 -0700
Subject: [PATCH 147/169] Makes extra variables CodeMirror shown only for
 JT-schedules that

have promptable extra vars in the JT. Hides vars for all other schedule types
---
 awx/ui/client/features/jobs/index.view.html   |  4 +--
 .../src/scheduler/schedulerEdit.controller.js | 35 ++++++++-----------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/awx/ui/client/features/jobs/index.view.html b/awx/ui/client/features/jobs/index.view.html
index 04b176d8ac..2328e24261 100644
--- a/awx/ui/client/features/jobs/index.view.html
+++ b/awx/ui/client/features/jobs/index.view.html
@@ -2,13 +2,13 @@
 <div class="tab-pane" id="jobs-page">
     <at-panel ng-cloak id="htmlTemplate">
         <div>
-            <div ng-hide="$state.is('jobs.schedules') || $state.is('jobs.schedules.edit')">
+            <div ng-hide="$state.includes('jobs.schedules')">
                 <at-panel-heading hide-dismiss="true">
                     <translate>JOBS</translate>
                 </at-panel-heading>
                 <div ui-view="jobsList"></div>
             </div>
-            <div ng-hide="!$state.is('jobs.schedules') && !$state.is('jobs.schedules.edit')">
+            <div ng-hide="!$state.includes('jobs.schedules')">
                 <at-panel-heading hide-dismiss="true">
                     <translate>SCHEDULES</translate>
                 </at-panel-heading>
diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index f9d603fbd1..b50f6dbb52 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -225,6 +225,7 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
         scheduler.setName(schedule.name);
         $rootScope.breadcrumb.schedule_name = $scope.schedulerName;
         $rootScope.breadcrumb[`${$scope.parentObject.type}_name`] = $scope.parentObject.name;
+        $scope.noVars = true;
         scheduler.scope.timeZones = timezonesResolve;
         scheduler.scope.schedulerTimeZone = scheduleResolve.timezone;
         if ($scope.cleanupJob){
@@ -297,7 +298,19 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
 
                     prompts.credentials.value = defaultCredsWithoutOverrides.concat(scheduleCredentials);
 
-                    if (!launchConf.ask_variables_on_launch) {
+                    if (launchConf.ask_variables_on_launch) {
+                        // the extra vars codemirror is ONLY shown if the
+                        // schedule is for a JT and the JT has
+                        // ask_variables_on_launch = true.
+                        $scope.extraVars = ParentObject.extra_vars === '' ? '---' : ParentObject.extra_vars;
+                        $scope.noVars = false;
+                        ParseTypeChange({
+                            scope: $scope,
+                            variable: 'extraVars',
+                            parse_variable: 'parseType',
+                            field_id: 'SchedulerForm-extraVars'
+                        });
+                    } else {
                         $scope.noVars = true;
                     }
 
@@ -449,28 +462,10 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
                         }
                     }
                 });
-        }
 
-        // extra_data field is not manifested in the UI when scheduling a Management Job
-        if ($state.current.name !== 'managementJobsList.schedule.add' && $state.current.name !== 'managementJobsList.schedule.edit'){
-            if ($state.current.name === 'projects.edit.schedules.edit' ||
-                $state.current.name === 'inventories.edit.inventory_sources.edit.schedules.edit' ||
-                $state.current.name === 'templates.editWorkflowJobTemplate.schedules.add' ||
-                $scope.parentObject.type === 'inventory_source' ||
-                $scope.parentObject.type === 'project'
-            ){
-                $scope.noVars = true;
-            } else {
-                ParseTypeChange({
-                    scope: $scope,
-                    variable: 'extraVars',
-                    parse_variable: 'parseType',
-                    field_id: 'SchedulerForm-extraVars',
-                    readOnly: !$scope.schedule_obj.summary_fields.user_capabilities.edit
-                });
-            }
         }
     }
+
     init();
 
     callSelect2();

From d5fbb2d3b69e1c39f744ace0414fd3329a6fad8e Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 15 May 2018 14:57:47 -0400
Subject: [PATCH 148/169] remove md5 password hashing in dev

---
 awx/settings/development.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/awx/settings/development.py b/awx/settings/development.py
index 9f1d916bc0..e7dc0152f6 100644
--- a/awx/settings/development.py
+++ b/awx/settings/development.py
@@ -103,13 +103,6 @@ if 'django_jenkins' in INSTALLED_APPS:
 
 INSTALLED_APPS += ('rest_framework_swagger',)
 
-# Much faster than the default
-# https://docs.djangoproject.com/en/1.6/topics/auth/passwords/#how-django-stores-passwords
-PASSWORD_HASHERS = (
-    'django.contrib.auth.hashers.MD5PasswordHasher',
-    'django.contrib.auth.hashers.PBKDF2PasswordHasher',
-)
-
 # Configure a default UUID for development only.
 SYSTEM_UUID = '00000000-0000-0000-0000-000000000000'
 

From db1a669c689d11853edee1d9de421567e10a08d9 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 15 May 2018 16:51:58 -0400
Subject: [PATCH 149/169] work around a django-polymorphic bug that breaks
 certain cascades

see: #1794
---
 awx/main/models/__init__.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/awx/main/models/__init__.py b/awx/main/models/__init__.py
index 7764655419..6541a8f9ed 100644
--- a/awx/main/models/__init__.py
+++ b/awx/main/models/__init__.py
@@ -3,6 +3,7 @@
 
 # Django
 from django.conf import settings # noqa
+from django.db.models.signals import pre_delete  # noqa
 
 # AWX
 from awx.main.models.base import * # noqa
@@ -58,6 +59,18 @@ User.add_to_class('can_access_with_errors', check_user_access_with_errors)
 User.add_to_class('accessible_objects', user_accessible_objects)
 
 
+def cleanup_created_modified_by(sender, **kwargs):
+    # work around a bug in django-polymorphic that doesn't properly
+    # handle cascades for reverse foreign keys on the polymorphic base model
+    # https://github.com/django-polymorphic/django-polymorphic/issues/229
+    for cls in (UnifiedJobTemplate, UnifiedJob):
+        cls.objects.filter(created_by=kwargs['instance']).update(created_by=None)
+        cls.objects.filter(modified_by=kwargs['instance']).update(modified_by=None)
+
+
+pre_delete.connect(cleanup_created_modified_by, sender=User)
+
+
 @property
 def user_get_organizations(user):
     return Organization.objects.filter(member_role__members=user)

From 7b5dcee30f37ce4719b37eabe1a2cf6fd09660a3 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 15 May 2018 17:17:56 -0400
Subject: [PATCH 150/169] fix smart status bar color

---
 awx/ui/client/features/output/_index.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/features/output/_index.less b/awx/ui/client/features/output/_index.less
index e7b4a43dd9..cb8e2940fd 100644
--- a/awx/ui/client/features/output/_index.less
+++ b/awx/ui/client/features/output/_index.less
@@ -219,7 +219,7 @@
 .HostStatusBar-ok,
 .HostStatusBar-changed,
 .HostStatusBar-dark,
-.HostStatusBar-failed,
+.HostStatusBar-failures,
 .HostStatusBar-skipped,
 .HostStatusBar-noData {
     height: 15px;
@@ -243,7 +243,7 @@
     flex: 0 0 auto;
 }
 
-.HostStatusBar-failed {
+.HostStatusBar-failures {
     background-color: @default-err;
     flex: 0 0 auto;
 }

From 87239c0e11b5483a7a45a611717d2e43c8c474fe Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 15 May 2018 17:18:35 -0400
Subject: [PATCH 151/169] right align smart inv button

---
 awx/ui/client/src/inventories-hosts/hosts/host.list.js       | 2 +-
 awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/src/inventories-hosts/hosts/host.list.js b/awx/ui/client/src/inventories-hosts/hosts/host.list.js
index 2422666878..1e9347a377 100644
--- a/awx/ui/client/src/inventories-hosts/hosts/host.list.js
+++ b/awx/ui/client/src/inventories-hosts/hosts/host.list.js
@@ -21,7 +21,7 @@ export default ['i18n', function(i18n) {
         trackBy: 'host.id',
         basePath: 'hosts',
         title: false,
-        actionHolderClass: 'List-actionHolder List-actionHolder--leftAlign',
+        actionHolderClass: 'List-actionHolder',
 
         fields: {
             toggleHost: {
diff --git a/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html
index acc6f585cd..d366b30687 100644
--- a/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html
+++ b/awx/ui/client/src/inventories-hosts/hosts/hosts.partial.html
@@ -11,7 +11,7 @@
             </div>
         </div>
         <div>
-            <div class="List-actionHolder List-actionHolder--leftAlign">
+            <div class="List-actionHolder">
                 <div class="List-actions">
                     <div ng-include="'/static/partials/shared/list-generator/list-actions.partial.html'"></div>
                 </div>
@@ -29,7 +29,7 @@
                     default-params="host_default_params"
                     query-set="host_queryset"
                     search-tags="searchTags">
-                </smart-search>
+                </smart-search>  
             </div>
 
             <div class="row" ng-show="hosts.length === 0 && !(searchTags | isEmpty)">

From 3a6f1e2b63c6a507c489596ecf6029076d9270e0 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 15 May 2018 17:18:51 -0400
Subject: [PATCH 152/169] make labels input standard width on wfjt form

---
 awx/ui/client/src/templates/workflows.form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js
index 42face36b2..b484d33c7e 100644
--- a/awx/ui/client/src/templates/workflows.form.js
+++ b/awx/ui/client/src/templates/workflows.form.js
@@ -71,7 +71,6 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
                 labels: {
                     label: i18n._('Labels'),
                     type: 'select',
-                    class: 'Form-formGroup--fullWidth',
                     ngOptions: 'label.label for label in labelOptions track by label.value',
                     multiSelect: true,
                     dataTitle: i18n._('Labels'),

From 1e6905aac41b1045edc2cafa88e27ba377acbea5 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Tue, 15 May 2018 15:31:21 -0700
Subject: [PATCH 153/169] Fixes to the scheduler form

---
 awx/ui/client/src/scheduler/schedulerEdit.controller.js | 5 ++++-
 awx/ui/client/src/scheduler/schedulerForm.partial.html  | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/scheduler/schedulerEdit.controller.js b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
index b50f6dbb52..3a2d3cd187 100644
--- a/awx/ui/client/src/scheduler/schedulerEdit.controller.js
+++ b/awx/ui/client/src/scheduler/schedulerEdit.controller.js
@@ -207,7 +207,10 @@ function($filter, $state, $stateParams, Wait, $scope, moment,
                 "yearlyOtherMonth",
                 "schedulerEnd",
                 "schedulerOccurrenceCount",
-                "schedulerEndDt"
+                "schedulerEndDt",
+                "schedulerEndHour",
+                "schedulerEndMinute",
+                "schedulerEndSecond"
             ], function() {
                 $rootScope.$broadcast("loadSchedulerDetailPane");
             }, true);
diff --git a/awx/ui/client/src/scheduler/schedulerForm.partial.html b/awx/ui/client/src/scheduler/schedulerForm.partial.html
index 38245c3a12..8afed91a0c 100644
--- a/awx/ui/client/src/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/scheduler/schedulerForm.partial.html
@@ -572,9 +572,9 @@
         </form>
         <div class="SchedulerFormDetail-container
             SchedulerFormDetail-container--error"
-            ng-show="!schedulerIsValid && scheduler_form.$dirty">
+            ng-show="(preview_list.isEmpty && scheduler_form.$dirty) || (!schedulerIsValid && scheduler_form.$dirty)">
             <p class="SchedulerFormDetail-errorText">
-                The scheduler options are invalid or incomplete.
+                The scheduler options are invalid, incomplete, or a date is in the past.
             </p>
         </div>
         <div class="SchedulerFormDetail-container"
@@ -607,7 +607,7 @@
                             ng-model="dateChoice"
                             id="date-choice-local"
                             value="local" >
-                        Local time
+                        Local Time Zone
                     </label>
                     <label class="radio-inline
                         SchedulerFormDetail-radioLabel">

From 3658ce1a93d776bcda0b22754320514f147f7de0 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Tue, 15 May 2018 18:09:07 -0700
Subject: [PATCH 154/169] Uses atCodeMirror directive for extra vars widget on
 workflow results page

---
 .../features/output/details.partial.html      |  1 -
 .../workflow-results.block.less               |  5 ++--
 .../workflow-results.controller.js            |  6 ++--
 .../workflow-results.partial.html             | 28 ++++++-------------
 4 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/awx/ui/client/features/output/details.partial.html b/awx/ui/client/features/output/details.partial.html
index fd0d51c2d4..1bc8acc7ee 100644
--- a/awx/ui/client/features/output/details.partial.html
+++ b/awx/ui/client/features/output/details.partial.html
@@ -288,7 +288,6 @@
     variables="{{ vm.extraVars.value }}"
     tooltip="{{ vm.extraVars.tooltip }}"
     label="{{ vm.extraVars.label}}"
-    label-class="JobResults-resultRowLabel"
     disabled="{{ vm.extraVars.disabled }}">
 </at-code-mirror>
 
diff --git a/awx/ui/client/src/workflow-results/workflow-results.block.less b/awx/ui/client/src/workflow-results/workflow-results.block.less
index 04e15c0c30..53a98f4db5 100644
--- a/awx/ui/client/src/workflow-results/workflow-results.block.less
+++ b/awx/ui/client/src/workflow-results/workflow-results.block.less
@@ -137,7 +137,6 @@
     margin-left: 20px;
 }
 
-.WorkflowResults-extraVarsHelp {
-    margin-left: 10px;
-    color: @default-icon;
+.WorkflowResults-extraVarsLabel {
+    font-size:14px!important;
 }
diff --git a/awx/ui/client/src/workflow-results/workflow-results.controller.js b/awx/ui/client/src/workflow-results/workflow-results.controller.js
index 85112cddd8..23e2fe7269 100644
--- a/awx/ui/client/src/workflow-results/workflow-results.controller.js
+++ b/awx/ui/client/src/workflow-results/workflow-results.controller.js
@@ -84,9 +84,9 @@ export default ['workflowData', 'workflowResultsService', 'workflowDataOptions',
             // set up a read only code mirror for extra vars
             $scope.variables = ParseVariableString($scope.workflow.extra_vars);
             $scope.parseType = 'yaml';
-            ParseTypeChange({ scope: $scope,
-                field_id: 'pre-formatted-variables',
-                readOnly: true });
+            $scope.varsTooltip= i18n._('Read only view of extra variables added to the workflow.');
+            $scope.varsLabel = i18n._('Extra Variables');
+
 
             // Click binding for the expand/collapse button on the standard out log
             $scope.stdoutFullScreen = false;
diff --git a/awx/ui/client/src/workflow-results/workflow-results.partial.html b/awx/ui/client/src/workflow-results/workflow-results.partial.html
index 2cb7f3fedb..dd8def8283 100644
--- a/awx/ui/client/src/workflow-results/workflow-results.partial.html
+++ b/awx/ui/client/src/workflow-results/workflow-results.partial.html
@@ -145,26 +145,14 @@
                     </div>
 
                     <!-- EXTRA VARIABLES DETAIL -->
-                    <div class="WorkflowResults-resultRow
-                        WorkflowResults-resultRow--variables"
-                        ng-show="variables">
-                        <label class="WorkflowResults-resultRowLabel
-                            WorkflowResults-resultRowLabel--fullWidth">
-                            Extra Variables
-                            <i class="WorkflowResults-extraVarsHelp fa fa-question-circle"
-                                aw-tool-tip="{{'Read only view of extra variables added to the workflow.'|translate}}"
-                                data-placement="top">
-                            </i>
-                        </label>
-                        <textarea
-                            rows="6"
-                            ng-model="variables"
-                            name="variables"
-                            class="form-control Form-textArea Form-textAreaLabel Form-formGroup--fullWidth"
-                            id="pre-formatted-variables"
-                            disabled="disabled">
-                        </textarea>
-                    </div>
+                    <at-code-mirror
+                        ng-if="variables"
+                        variables="{{ variables }}"
+                        tooltip="{{ varsTooltip }}"
+                        label="{{ varsLabel }}"
+                        label-class="WorkflowResults-extraVarsLabel"
+                        disabled="disabled">
+                    </at-code-mirror>
 
                     <!-- LABELS DETAIL -->
                     <div class="WorkflowResults-resultRow"

From 11e7dcd0dc1145b3e5dedbe50185d739dcc8cee0 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Tue, 15 May 2018 23:37:32 -0400
Subject: [PATCH 155/169] maintain correct page counts on running jobs

---
 .../features/output/api.events.service.js     | 132 ++++++++++++++++++
 .../features/output/index.controller.js       |  49 ++-----
 awx/ui/client/features/output/index.js        |  24 +++-
 awx/ui/client/features/output/page.service.js |  63 ++++-----
 4 files changed, 187 insertions(+), 81 deletions(-)
 create mode 100644 awx/ui/client/features/output/api.events.service.js

diff --git a/awx/ui/client/features/output/api.events.service.js b/awx/ui/client/features/output/api.events.service.js
new file mode 100644
index 0000000000..39499eff46
--- /dev/null
+++ b/awx/ui/client/features/output/api.events.service.js
@@ -0,0 +1,132 @@
+const PAGE_LIMIT = 5;
+const PAGE_SIZE = 50;
+
+const BASE_PARAMS = {
+    order_by: 'start_line',
+    page_size: PAGE_SIZE,
+};
+
+const merge = (...objs) => _.merge({}, ...objs);
+
+const getInitialState = params => ({
+    results: [],
+    count: 0,
+    previous: 1,
+    page: 1,
+    next: 1,
+    last: 1,
+    params: merge(BASE_PARAMS, params),
+});
+
+function JobEventsApiService ($http, $q) {
+    this.init = (endpoint, params) => {
+        this.keys = [];
+        this.cache = {};
+        this.pageSizes = {};
+        this.endpoint = endpoint;
+        this.state = getInitialState(params);
+    };
+
+    this.getLastPage = count => Math.ceil(count / this.state.params.page_size);
+
+    this.fetch = () => {
+        delete this.cache;
+        delete this.keys;
+        delete this.pageSizes;
+
+        this.cache = {};
+        this.keys = [];
+        this.pageSizes = {};
+
+        return this.getPage(1).then(() => this);
+    };
+
+    this.getPage = number => {
+        if (number < 1 || number > this.state.last) {
+            return $q.resolve();
+        }
+
+        if (this.cache[number]) {
+            if (this.pageSizes[number] === PAGE_SIZE) {
+                return this.cache[number];
+            }
+
+            delete this.pageSizes[number];
+            delete this.cache[number];
+
+            this.keys.splice(this.keys.indexOf(number));
+        }
+
+        const { params } = this.state;
+
+        delete params.page;
+
+        params.page = number;
+
+        const promise = $http.get(this.endpoint, { params })
+            .then(({ data }) => {
+                const { results, count } = data;
+
+                this.state.results = results;
+                this.state.count = count;
+                this.state.page = number;
+                this.state.last = this.getLastPage(count);
+                this.state.previous = Math.max(1, number - 1);
+                this.state.next = Math.min(this.state.last, number + 1);
+
+                this.pageSizes[number] = results.length;
+
+                return { results, page: number };
+            });
+
+        this.cache[number] = promise;
+        this.keys.push(number);
+
+        if (this.keys.length > PAGE_LIMIT) {
+            delete this.cache[this.keys.shift()];
+        }
+
+        return promise;
+    };
+
+    this.first = () => this.getPage(1);
+    this.next = () => this.getPage(this.state.next);
+    this.previous = () => this.getPage(this.state.previous);
+
+    this.last = () => {
+        const params = merge({}, this.state.params);
+
+        delete params.page;
+        delete params.order_by;
+
+        params.page = 1;
+        params.order_by = '-start_line';
+
+        const promise = $http.get(this.endpoint, { params })
+            .then(({ data }) => {
+                const { results, count } = data;
+                const lastPage = this.getLastPage(count);
+
+                results.reverse();
+                const shifted = results.splice(count % PAGE_SIZE);
+
+                this.state.results = shifted;
+                this.state.count = count;
+                this.state.page = lastPage;
+                this.state.next = lastPage;
+                this.state.last = lastPage;
+                this.state.previous = Math.max(1, this.state.page - 1);
+
+                return { results: shifted, page: lastPage };
+            });
+
+        return promise;
+    };
+}
+
+JobEventsApiService.$inject = [
+    '$http',
+    '$q'
+];
+
+export default JobEventsApiService;
diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js
index 5f5ba6b6eb..a6761238c4 100644
--- a/awx/ui/client/features/output/index.controller.js
+++ b/awx/ui/client/features/output/index.controller.js
@@ -7,7 +7,6 @@ let resource;
 let scroll;
 let engine;
 let status;
-let $http;
 
 let vm;
 let streaming;
@@ -23,7 +22,6 @@ function JobsIndexController (
     _$compile_,
     _$q_,
     _status_,
-    _$http_,
 ) {
     vm = this || {};
 
@@ -37,7 +35,6 @@ function JobsIndexController (
     render = _render_;
     engine = _engine_;
     status = _status_;
-    $http = _$http_;
 
     // Development helper(s)
     vm.clear = devClear;
@@ -128,37 +125,20 @@ function handleJobEvent (data) {
 }
 
 function attachToRunningJob () {
-    const target = `${resource.model.get('url')}${resource.related}/`;
-    const params = { order_by: '-created', page_size: resource.page.size };
+    if (!status.state.running) {
+        return $q.resolve();
+    }
 
-    scroll.pause();
-
-    return render.clear()
-        .then(() => $http.get(target, { params }))
-        .then(res => {
-            const { results } = res.data;
-
-            const minLine = 1 + Math.max(...results.map(event => event.end_line));
-            const maxCount = Math.max(...results.map(event => event.counter));
-
-            const lastPage = resource.model.updateCount(maxCount);
-
-            page.emptyCache(lastPage);
-            page.addPage(lastPage, [], true);
-
-            engine.setMinLine(minLine);
-
-            if (resource.model.page.current === lastPage) {
+    return page.last()
+        .then(events => {
+            if (!events) {
                 return $q.resolve();
             }
 
-            return append(results);
-        })
-        .then(() => {
-            scroll.setScrollPosition(scroll.getScrollHeight());
-            scroll.resume();
+            const minLine = 1 + Math.max(...events.map(event => event.end_line));
 
-            return $q.resolve();
+            return render.clear()
+                .then(() => engine.setMinLine(minLine));
         });
 }
 
@@ -293,11 +273,11 @@ function scrollEnd () {
             }
 
             return render.clear()
-                .then(() => append(events))
-                .then(() => {
-                    scroll.setScrollPosition(scroll.getScrollHeight());
-                    scroll.resume();
-                });
+                .then(() => append(events));
+        })
+        .then(() => {
+            scroll.setScrollPosition(scroll.getScrollHeight());
+            scroll.resume();
         });
 }
 
@@ -379,7 +359,6 @@ JobsIndexController.$inject = [
     '$compile',
     '$q',
     'JobStatusService',
-    '$http',
 ];
 
 module.exports = JobsIndexController;
diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js
index a8d635ed3a..be7bf49b33 100644
--- a/awx/ui/client/features/output/index.js
+++ b/awx/ui/client/features/output/index.js
@@ -9,6 +9,7 @@ import ScrollService from '~features/output/scroll.service';
 import EngineService from '~features/output/engine.service';
 import StatusService from '~features/output/status.service';
 import MessageService from '~features/output/message.service';
+import EventsApiService from '~features/output/api.events.service';
 import LegacyRedirect from '~features/output/legacy.route';
 
 import DetailsComponent from '~features/output/details.component';
@@ -35,7 +36,8 @@ function resolveResource (
     InventoryUpdate,
     $stateParams,
     qs,
-    Wait
+    Wait,
+    eventsApi,
 ) {
     const { id, type, handleErrors } = $stateParams;
     const { job_event_search } = $stateParams; // eslint-disable-line camelcase
@@ -86,23 +88,29 @@ function resolveResource (
         Object.assign(config.params, query);
     }
 
+    let model;
+
     Wait('start');
     const resourcePromise = new Resource(['get', 'options'], [id, id])
-        .then(model => {
-            const promises = [model.getStats()];
+        .then(job => {
+            const endpoint = `${job.get('url')}${related}/`;
+            eventsApi.init(endpoint, config.params);
 
-            if (model.has('related.labels')) {
-                promises.push(model.extend('get', 'labels'));
+            const promises = [job.getStats(), eventsApi.fetch()];
+
+            if (job.has('related.labels')) {
+                promises.push(job.extend('get', 'labels'));
             }
 
-            promises.push(model.extend('get', related, config));
+            model = job;
             return Promise.all(promises);
         })
-        .then(([stats, model]) => ({
+        .then(([stats, events]) => ({
             id,
             type,
             stats,
             model,
+            events,
             related,
             ws: {
                 events: `${WS_PREFIX}-${key}-${id}`,
@@ -217,6 +225,7 @@ function JobsRun ($stateRegistry, strings) {
                 '$stateParams',
                 'QuerySet',
                 'Wait',
+                'JobEventsApiService',
                 resolveResource
             ],
             breadcrumbLabel: [
@@ -246,6 +255,7 @@ angular
     .service('JobEventEngine', EngineService)
     .service('JobStatusService', StatusService)
     .service('JobMessageService', MessageService)
+    .service('JobEventsApiService', EventsApiService)
     .component('atJobSearch', SearchComponent)
     .component('atJobStats', StatsComponent)
     .component('atJobDetails', DetailsComponent)
diff --git a/awx/ui/client/features/output/page.service.js b/awx/ui/client/features/output/page.service.js
index 5f19fe921a..854bda23b0 100644
--- a/awx/ui/client/features/output/page.service.js
+++ b/awx/ui/client/features/output/page.service.js
@@ -1,6 +1,7 @@
 function JobPageService ($q) {
     this.init = ({ resource }) => {
         this.resource = resource;
+        this.api = this.resource.events;
 
         this.page = {
             limit: this.resource.page.pageLimit,
@@ -125,8 +126,9 @@ function JobPageService ($q) {
         number = number || reference.state.current;
 
         reference.state.first = number;
-        reference.state.last = number;
         reference.state.current = number;
+        reference.state.last = number;
+
         reference.cache.splice(0, reference.cache.length);
     };
 
@@ -203,9 +205,9 @@ function JobPageService ($q) {
 
     this.next = () => {
         const reference = this.getActiveReference();
-        const config = this.buildRequestConfig(reference.state.last + 1);
+        const number = reference.state.last + 1;
 
-        return this.resource.model.goToPage(config)
+        return this.api.getPage(number)
             .then(data => {
                 if (!data || !data.results) {
                     return $q.resolve();
@@ -219,9 +221,8 @@ function JobPageService ($q) {
 
     this.previous = () => {
         const reference = this.getActiveReference();
-        const config = this.buildRequestConfig(reference.state.first - 1);
 
-        return this.resource.model.goToPage(config)
+        return this.api.getPage(reference.state.first - 1)
             .then(data => {
                 if (!data || !data.results) {
                     return $q.resolve();
@@ -233,45 +234,29 @@ function JobPageService ($q) {
             });
     };
 
-    this.last = () => {
-        const config = this.buildRequestConfig('last');
+    this.last = () => this.api.last()
+        .then(data => {
+            if (!data || !data.results || !data.results.length > 0) {
+                return $q.resolve();
+            }
 
-        return this.resource.model.goToPage(config)
-            .then(data => {
-                if (!data || !data.results) {
-                    return $q.resolve();
-                }
+            this.emptyCache(data.page);
+            this.addPage(data.page, [], true);
 
-                this.emptyCache(data.page);
-                this.addPage(data.page, [], true);
+            return data.results;
+        });
 
-                return data.results;
-            });
-    };
+    this.first = () => this.api.first()
+        .then(data => {
+            if (!data || !data.results) {
+                return $q.resolve();
+            }
 
-    this.first = () => {
-        const config = this.buildRequestConfig('first');
+            this.emptyCache(data.page);
+            this.addPage(data.page, [], false);
 
-        return this.resource.model.goToPage(config)
-            .then(data => {
-                if (!data || !data.results) {
-                    return $q.resolve();
-                }
-
-                this.emptyCache(data.page);
-                this.addPage(data.page, [], false);
-
-                return data.results;
-            });
-    };
-
-    this.buildRequestConfig = number => ({
-        page: number,
-        related: this.resource.related,
-        params: {
-            order_by: 'start_line'
-        }
-    });
+            return data.results;
+        });
 
     this.getActiveReference = () => (this.isBookmarkSet() ?
         this.getReference(true) : this.getReference());

From 39cb1cb60c5ed1240546e388e01a97fe18de03dd Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Wed, 16 May 2018 09:35:04 -0400
Subject: [PATCH 156/169] fix a nuanced parsing bug in naive UNTIL= parsing

---
 awx/main/models/schedules.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/awx/main/models/schedules.py b/awx/main/models/schedules.py
index 13048dcf7d..55cd7f2053 100644
--- a/awx/main/models/schedules.py
+++ b/awx/main/models/schedules.py
@@ -153,12 +153,12 @@ class Schedule(CommonModel, LaunchTimeConfig):
         if 'until=' in rrule.lower():
             # if DTSTART;TZID= is used, coerce "naive" UNTIL values
             # to the proper UTC date
-            match_until = re.match(".*?UNTIL\=(?P<until>[0-9]+T[0-9]+)(?P<utcflag>Z?)", rrule)
+            match_until = re.match(".*?(?P<until>UNTIL\=[0-9]+T[0-9]+)(?P<utcflag>Z?)", rrule)
             if not len(match_until.group('utcflag')):
                 # rrule = DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T170000
 
                 # Find the UNTIL=N part of the string
-                # naive_until = 20200601T170000
+                # naive_until = UNTIL=20200601T170000
                 naive_until = match_until.group('until')
 
                 # What is the DTSTART timezone for:
@@ -172,13 +172,13 @@ class Schedule(CommonModel, LaunchTimeConfig):
                 # Make a datetime object with tzinfo=<the DTSTART timezone>
                 # localized_until = datetime.datetime(2020, 6, 1, 17, 0, tzinfo=tzfile('/usr/share/zoneinfo/America/New_York'))
                 localized_until = make_aware(
-                    datetime.datetime.strptime(naive_until, "%Y%m%dT%H%M%S"),
+                    datetime.datetime.strptime(re.sub('^UNTIL=', '', naive_until), "%Y%m%dT%H%M%S"),
                     local_tz
                 )
 
                 # Coerce the datetime to UTC and format it as a string w/ Zulu format
-                # utc_until = 20200601T220000Z
-                utc_until = localized_until.astimezone(pytz.utc).strftime('%Y%m%dT%H%M%SZ')
+                # utc_until = UNTIL=20200601T220000Z
+                utc_until = 'UNTIL=' + localized_until.astimezone(pytz.utc).strftime('%Y%m%dT%H%M%SZ')
 
                 # rrule was:    DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T170000
                 # rrule is now: DTSTART;TZID=America/New_York:20200601T120000 RRULE:...;UNTIL=20200601T220000Z

From 53ef9ed28895d04e9cc96fb801001ef335ef94fe Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Tue, 15 May 2018 14:17:55 -0400
Subject: [PATCH 157/169] never convert ANSI codes to HTML for format
 /stdout/?format=json

see: https://github.com/ansible/awx/issues/1863
---
 awx/api/views.py                                         | 9 ++++-----
 .../tests/functional/api/test_unified_jobs_stdout.py     | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/awx/api/views.py b/awx/api/views.py
index 2d1044fb8f..154fb84e88 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -4764,7 +4764,6 @@ class UnifiedJobStdout(RetrieveAPIView):
         try:
             target_format = request.accepted_renderer.format
             if target_format in ('html', 'api', 'json'):
-                content_format = request.query_params.get('content_format', 'html')
                 content_encoding = request.query_params.get('content_encoding', None)
                 start_line = request.query_params.get('start_line', 0)
                 end_line = request.query_params.get('end_line', None)
@@ -4790,10 +4789,10 @@ class UnifiedJobStdout(RetrieveAPIView):
                 if target_format == 'api':
                     return Response(mark_safe(data))
                 if target_format == 'json':
-                    if content_encoding == 'base64' and content_format == 'ansi':
-                        return Response({'range': {'start': start, 'end': end, 'absolute_end': absolute_end}, 'content': b64encode(content.encode('utf-8'))})
-                    elif content_format == 'html':
-                        return Response({'range': {'start': start, 'end': end, 'absolute_end': absolute_end}, 'content': body})
+                    content = content.encode('utf-8')
+                    if content_encoding == 'base64':
+                        content = b64encode(content)
+                    return Response({'range': {'start': start, 'end': end, 'absolute_end': absolute_end}, 'content': content})
                 return Response(data)
             elif target_format == 'txt':
                 return Response(unified_job.result_stdout)
diff --git a/awx/main/tests/functional/api/test_unified_jobs_stdout.py b/awx/main/tests/functional/api/test_unified_jobs_stdout.py
index f51920fd41..f399dca389 100644
--- a/awx/main/tests/functional/api/test_unified_jobs_stdout.py
+++ b/awx/main/tests/functional/api/test_unified_jobs_stdout.py
@@ -282,7 +282,7 @@ def test_unicode_with_base64_ansi(sqlite_copy_expert, get, admin):
     url = reverse(
         'api:job_stdout',
         kwargs={'pk': job.pk}
-    ) + '?format=json&content_encoding=base64&content_format=ansi'
+    ) + '?format=json&content_encoding=base64'
 
     response = get(url, user=admin, expect=200)
     content = base64.b64decode(json.loads(response.content)['content'])

From f2e02146231cc1742a90f85d7650c345aba5ee20 Mon Sep 17 00:00:00 2001
From: Marliana Lara <mlara@redhat.com>
Date: Wed, 16 May 2018 11:58:31 -0400
Subject: [PATCH 158/169] Hookup instance policy list smart search and add
 Dataset resolve

---
 .../instance-list-policy.directive.js         | 30 +++++++-----
 .../instance-list-policy.partial.html         | 12 ++---
 awx/ui/client/src/instance-groups/main.js     | 49 +++++++++++++++----
 3 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/awx/ui/client/src/instance-groups/add-edit/instance-list-policy.directive.js b/awx/ui/client/src/instance-groups/add-edit/instance-list-policy.directive.js
index 897261c9c5..6b9111ab23 100644
--- a/awx/ui/client/src/instance-groups/add-edit/instance-list-policy.directive.js
+++ b/awx/ui/client/src/instance-groups/add-edit/instance-list-policy.directive.js
@@ -4,24 +4,29 @@ function InstanceListPolicyLink (scope, el, attrs, controllers) {
     const instancePolicyController = controllers[0];
     const formController = controllers[1];
     const models = scope.$resolve.resolvedModels;
+    const Dataset = scope.$resolve.Dataset;
 
-    instancePolicyController.init(formController, models);
+    instancePolicyController.init(formController, models, Dataset);
 }
 
-
 function InstanceListPolicyController ($scope, $state, strings) {
     const vm = this || {};
     let form;
-    let instance;
     let instanceGroup;
+    vm.strings = strings;
 
-    vm.init = (_form_, _models_) => {
+    vm.init = (_form_, _models_, Dataset) => {
         form = _form_;
-        ({ instance, instanceGroup} = _models_);
+        ({ instanceGroup } = _models_);
 
-        vm.strings = strings;
         vm.instanceGroupId = instanceGroup.get('id');
-        vm.defaultParams = { page_size: '10', order_by: 'hostname' };
+
+        $scope.list = {
+            name: 'instances',
+            iterator: 'instance'
+        };
+        $scope.instance_dataset = Dataset.data;
+        $scope.instances = Dataset.data.results;
 
         if (vm.instanceGroupId === undefined) {
             vm.setInstances();
@@ -31,25 +36,24 @@ function InstanceListPolicyController ($scope, $state, strings) {
     };
 
     vm.setInstances = () => {
-        vm.instances = instance.get('results').map(instance => {
+        $scope.instances = $scope.instances.map(instance => {
             instance.isSelected = false;
             return instance;
         });
     };
 
     vm.setRelatedInstances = () => {
-        vm.instanceGroupName = instanceGroup.get('name');
         vm.relatedInstances = instanceGroup.get('policy_instance_list');
 
-        vm.instances = instance.get('results').map(instance => {
+        $scope.instances = $scope.instances.map(instance => {
             instance.isSelected = vm.relatedInstances.includes(instance.hostname);
             return instance;
         });
     };
 
-    $scope.$watch('vm.instances', function() {
-        vm.selectedRows = _.filter(vm.instances, 'isSelected');
-        vm.deselectedRows = _.filter(vm.instances, 'isSelected', false);
+    $scope.$watch('instances', function() {
+        vm.selectedRows = _.filter($scope.instances, 'isSelected');
+        vm.deselectedRows = _.filter($scope.instances, 'isSelected', false);
      }, true);
 
     vm.submit = () => {
diff --git a/awx/ui/client/src/instance-groups/add-edit/instance-list-policy.partial.html b/awx/ui/client/src/instance-groups/add-edit/instance-list-policy.partial.html
index 218e61421d..821bbffc64 100644
--- a/awx/ui/client/src/instance-groups/add-edit/instance-list-policy.partial.html
+++ b/awx/ui/client/src/instance-groups/add-edit/instance-list-policy.partial.html
@@ -3,7 +3,7 @@
         <at-panel-heading>
             {{:: vm.strings.get('instance.PANEL_TITLE') }}
         </at-panel-heading>
-        <multi-select-preview selected-rows='vm.selectedRows' available-rows='vm.instances'></multi-select-preview>
+        <multi-select-preview selected-rows='vm.selectedRows' available-rows='instances'></multi-select-preview>
         <at-panel-body>
             <div class="at-List-toolbar">
                 <smart-search
@@ -11,15 +11,15 @@
                     django-model="instances"
                     base-path="instances"
                     iterator="instance"
-                    default-params="vm.defaultParams"
                     list="list"
-                    dataset="vm.instances"
+                    dataset="instance_dataset"
                     collection="collection"
-                    search-tags="searchTags">
+                    search-tags="searchTags"
+                    query-set="querySet">
                 </smart-search>
             </div>
-            <at-list results='vm.instances'>
-                <at-row ng-repeat="instance in vm.instances"
+            <at-list results='instances'>
+                <at-row ng-repeat="instance in instances"
                     ng-class="{'at-Row--active': (instance.id === vm.activeId)}">
 
                     <input type="checkbox"
diff --git a/awx/ui/client/src/instance-groups/main.js b/awx/ui/client/src/instance-groups/main.js
index 2314aee41a..387a0740dc 100644
--- a/awx/ui/client/src/instance-groups/main.js
+++ b/awx/ui/client/src/instance-groups/main.js
@@ -35,15 +35,12 @@ function InstanceGroupsResolve ($q, $stateParams, InstanceGroup, Instance) {
 
     if (!instanceGroupId && !instanceId) {
         promises.instanceGroup = new InstanceGroup(['get', 'options']);
-        promises.instance = new Instance(['get', 'options']);
-
         return $q.all(promises);
     }
 
     if (instanceGroupId && instanceId) {
         promises.instance = new Instance(['get', 'options'], [instanceId, instanceId])
             .then((instance) => instance.extend('get', 'jobs', {params: {page_size: "10", order_by: "-finished"}}));
-
         return $q.all(promises);
     }
 
@@ -111,6 +108,14 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
         ncyBreadcrumb: {
             label: strings.get('state.ADD_BREADCRUMB_LABEL')
         },
+        params: {
+            instance_search: {
+                value: {
+                    order_by: 'hostname',
+                    page_size: '10'
+                }
+            }
+        },
         views: {
             'add@instanceGroups': {
                 templateUrl: AddEditTemplate,
@@ -119,7 +124,17 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
             }
         },
         resolve: {
-            resolvedModels: InstanceGroupsResolve
+            resolvedModels: InstanceGroupsResolve,
+            Dataset: [
+                '$stateParams',
+                'GetBasePath',
+                'QuerySet',
+                ($stateParams, GetBasePath, qs) => {
+                    const searchParams = $stateParams.instance_search;
+                    const searchPath = GetBasePath('instances');
+                    return qs.search(searchPath, searchParams);
+                }
+            ]
         }
     });
 
@@ -146,8 +161,7 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
             "modal": {
                 template: '<instance-list-policy></instance-list-policy>',
             }
-        },
-        resolvedModels: InstanceGroupsResolve
+        }
     });
 
     $stateExtender.addState({
@@ -156,6 +170,14 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
         ncyBreadcrumb: {
             label: strings.get('state.EDIT_BREADCRUMB_LABEL')
         },
+        params: {
+            instance_search: {
+                value: {
+                    order_by: 'hostname',
+                    page_size: '10'
+                }
+            }
+        },
         views: {
             'edit@instanceGroups': {
                 templateUrl: AddEditTemplate,
@@ -164,7 +186,17 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
             }
         },
         resolve: {
-            resolvedModels: InstanceGroupsResolve
+            resolvedModels: InstanceGroupsResolve,
+            Dataset: [
+                '$stateParams',
+                'GetBasePath',
+                'QuerySet',
+                ($stateParams, GetBasePath, qs) => {
+                    const searchParams = $stateParams.instance_search;
+                    const searchPath = GetBasePath('instances');
+                    return qs.search(searchPath, searchParams);
+                }
+            ]
         }
     });
 
@@ -192,8 +224,7 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
             "modal": {
                 template: '<instance-list-policy></instance-list-policy>',
             }
-        },
-        resolvedModels: InstanceGroupsResolve
+        }
     });
 
     $stateExtender.addState({

From 97ab6449b9e9c2a1b778eff3cd21f019402cafd4 Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Sat, 12 May 2018 20:35:01 -0400
Subject: [PATCH 159/169] parallelize test running

---
 Makefile                                         |  2 +-
 awx/main/managers.py                             |  2 +-
 awx/main/tests/conftest.py                       | 10 ++++++++++
 awx/main/tests/functional/test_rbac_oauth.py     |  8 ++++----
 awx/main/tests/unit/models/test_survey_models.py | 14 ++++++++++++--
 awx/main/tests/unit/test_access.py               |  2 +-
 awx/main/tests/unit/test_tasks.py                |  4 ++--
 awx/network_ui/tests/conftest.py                 |  9 +++++++++
 awx/settings/defaults.py                         |  8 +++++++-
 awx/settings/local_settings.py.docker_compose    |  3 ++-
 requirements/requirements_dev.txt                |  3 ++-
 11 files changed, 51 insertions(+), 14 deletions(-)
 create mode 100644 awx/network_ui/tests/conftest.py

diff --git a/Makefile b/Makefile
index 4c5202147f..0b9cc2a61c 100644
--- a/Makefile
+++ b/Makefile
@@ -379,7 +379,7 @@ test:
 	@if [ "$(VENV_BASE)" ]; then \
 		. $(VENV_BASE)/awx/bin/activate; \
 	fi; \
-	py.test $(TEST_DIRS)
+	py.test -n auto $(TEST_DIRS)
 
 test_combined: test_ansible test
 
diff --git a/awx/main/managers.py b/awx/main/managers.py
index 274a0ef774..d2af95e2b8 100644
--- a/awx/main/managers.py
+++ b/awx/main/managers.py
@@ -77,7 +77,7 @@ class InstanceManager(models.Manager):
     def me(self):
         """Return the currently active instance."""
         # If we are running unit tests, return a stub record.
-        if settings.IS_TESTING(sys.argv):
+        if settings.IS_TESTING(sys.argv) or hasattr(sys, '_called_from_test'):
             return self.model(id=1,
                               hostname='localhost',
                               uuid='00000000-0000-0000-0000-000000000000')
diff --git a/awx/main/tests/conftest.py b/awx/main/tests/conftest.py
index 679577858f..946c930dc5 100644
--- a/awx/main/tests/conftest.py
+++ b/awx/main/tests/conftest.py
@@ -15,6 +15,16 @@ from awx.main.tests.factories import (
 )
 
 
+def pytest_configure(config):
+    import sys
+    sys._called_from_test = True
+
+
+def pytest_unconfigure(config):
+    import sys
+    del sys._called_from_test
+
+
 @pytest.fixture
 def mock_access():
     @contextmanager
diff --git a/awx/main/tests/functional/test_rbac_oauth.py b/awx/main/tests/functional/test_rbac_oauth.py
index 35b915f94d..757c55e12b 100644
--- a/awx/main/tests/functional/test_rbac_oauth.py
+++ b/awx/main/tests/functional/test_rbac_oauth.py
@@ -102,21 +102,21 @@ class TestOAuth2Application:
                 assert access.can_delete(app) is can_access
     
 
-        def test_superuser_can_always_create(self, admin, org_admin, org_member, alice):
+        def test_superuser_can_always_create(self, admin, org_admin, org_member, alice, organization):
             access = OAuth2ApplicationAccess(admin)
             for user in [admin, org_admin, org_member, alice]:
                 assert access.can_add({
                     'name': 'test app', 'user': user.pk, 'client_type': 'confidential',
-                    'authorization_grant_type': 'password', 'organization': 1
+                    'authorization_grant_type': 'password', 'organization': organization.id
                 })
         
-        def test_normal_user_cannot_create(self, admin, org_admin, org_member, alice):
+        def test_normal_user_cannot_create(self, admin, org_admin, org_member, alice, organization):
             for access_user in [org_member, alice]:
                 access = OAuth2ApplicationAccess(access_user)
                 for user in [admin, org_admin, org_member, alice]:
                     assert not access.can_add({
                         'name': 'test app', 'user': user.pk, 'client_type': 'confidential',
-                        'authorization_grant_type': 'password', 'organization': 1
+                        'authorization_grant_type': 'password', 'organization': organization.id
                     })
 
 
diff --git a/awx/main/tests/unit/models/test_survey_models.py b/awx/main/tests/unit/models/test_survey_models.py
index 6ce19d2060..330014d481 100644
--- a/awx/main/tests/unit/models/test_survey_models.py
+++ b/awx/main/tests/unit/models/test_survey_models.py
@@ -1,8 +1,9 @@
 import tempfile
 import json
 import yaml
-
 import pytest
+from itertools import count
+
 from awx.main.utils.encryption import encrypt_value
 from awx.main.tasks import RunJob
 from awx.main.models import (
@@ -16,6 +17,15 @@ from awx.main.utils.safe_yaml import SafeLoader
 ENCRYPTED_SECRET = encrypt_value('secret')
 
 
+class DistinctParametrize(object):
+
+    def __init__(self):
+        self._gen = count(0)
+
+    def __call__(self, value):
+        return str(next(self._gen))
+
+
 @pytest.mark.survey
 class SurveyVariableValidation:
 
@@ -243,7 +253,7 @@ def test_optional_survey_question_defaults(
     ('password', 'foo', 5, {'extra_vars': {'x': ''}}, {'x': ''}),
     ('password', ENCRYPTED_SECRET, 5, {'extra_vars': {'x': '$encrypted$'}}, {}),
     ('password', ENCRYPTED_SECRET, 10, {'extra_vars': {'x': '$encrypted$'}}, {'x': ENCRYPTED_SECRET}),
-])
+    ], ids=DistinctParametrize())
 def test_survey_encryption_defaults(survey_spec_factory, question_type, default, maxlen, kwargs, expected):
     spec = survey_spec_factory([
         {
diff --git a/awx/main/tests/unit/test_access.py b/awx/main/tests/unit/test_access.py
index 6b20aaaed9..02e863f47f 100644
--- a/awx/main/tests/unit/test_access.py
+++ b/awx/main/tests/unit/test_access.py
@@ -158,7 +158,7 @@ def test_jt_existing_values_are_nonsensitive(job_template_with_ids, user_unit):
     """Assure that permission checks are not required if submitted data is
     identical to what the job template already has."""
 
-    data = model_to_dict(job_template_with_ids)
+    data = model_to_dict(job_template_with_ids, exclude=['unifiedjobtemplate_ptr'])
     access = JobTemplateAccess(user_unit)
 
     assert access.changes_are_non_sensitive(job_template_with_ids, data)
diff --git a/awx/main/tests/unit/test_tasks.py b/awx/main/tests/unit/test_tasks.py
index 39a4d52de4..c4e3abe9b9 100644
--- a/awx/main/tests/unit/test_tasks.py
+++ b/awx/main/tests/unit/test_tasks.py
@@ -2155,7 +2155,7 @@ def test_aquire_lock_open_fail_logged(logging_getLogger, os_open):
 
     ProjectUpdate = tasks.RunProjectUpdate()
 
-    with pytest.raises(OSError, errno=3, strerror='dummy message'):
+    with pytest.raises(OSError, message='dummy message'):
         ProjectUpdate.acquire_lock(instance)
     assert logger.err.called_with("I/O error({0}) while trying to open lock file [{1}]: {2}".format(3, 'this_file_does_not_exist', 'dummy message'))
 
@@ -2181,7 +2181,7 @@ def test_aquire_lock_acquisition_fail_logged(fcntl_flock, logging_getLogger, os_
 
     ProjectUpdate = tasks.RunProjectUpdate()
 
-    with pytest.raises(IOError, errno=3, strerror='dummy message'):
+    with pytest.raises(IOError, message='dummy message'):
         ProjectUpdate.acquire_lock(instance)
     os_close.assert_called_with(3)
     assert logger.err.called_with("I/O error({0}) while trying to aquire lock on file [{1}]: {2}".format(3, 'this_file_does_not_exist', 'dummy message'))
diff --git a/awx/network_ui/tests/conftest.py b/awx/network_ui/tests/conftest.py
new file mode 100644
index 0000000000..ca4f2f1cda
--- /dev/null
+++ b/awx/network_ui/tests/conftest.py
@@ -0,0 +1,9 @@
+import pytest
+from mock import PropertyMock
+
+
+@pytest.fixture(autouse=True)
+def _disable_database_settings(mocker):
+    m = mocker.patch('awx.conf.settings.SettingsWrapper.all_supported_settings', new_callable=PropertyMock)
+    m.return_value = []
+
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 2150aa77d8..66e9c3ee9a 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -4,7 +4,6 @@
 import os
 import re  # noqa
 import sys
-import ldap
 import djcelery
 import six
 from datetime import timedelta
@@ -39,6 +38,13 @@ def IS_TESTING(argv=None):
     return is_testing(argv)
 
 
+if "pytest" in sys.modules:
+    import mock
+    with mock.patch('__main__.__builtins__.dir', return_value=[]):
+        import ldap
+else:
+    import ldap
+
 DEBUG = True
 SQL_DEBUG = DEBUG
 
diff --git a/awx/settings/local_settings.py.docker_compose b/awx/settings/local_settings.py.docker_compose
index 8da2628e38..94d9ba0214 100644
--- a/awx/settings/local_settings.py.docker_compose
+++ b/awx/settings/local_settings.py.docker_compose
@@ -13,6 +13,7 @@
 ###############################################################################
 import os
 import urllib
+import sys
 
 
 def patch_broken_pipe_error():
@@ -66,7 +67,7 @@ DATABASES = {
 # Use SQLite for unit tests instead of PostgreSQL.  If the lines below are
 # commented out, Django will create the test_awx-dev database in PostgreSQL to
 # run unit tests.
-if is_testing(sys.argv):
+if "pytest" in sys.modules:
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.sqlite3',
diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt
index 5c5f8e30f5..29c846536b 100644
--- a/requirements/requirements_dev.txt
+++ b/requirements/requirements_dev.txt
@@ -6,12 +6,13 @@ unittest2
 pep8
 flake8
 pyflakes
-pytest==2.9.2
+pytest==3.5.1
 pytest-cov
 pytest-django
 pytest-pythonpath
 pytest-mock
 pytest-timeout
+pytest-xdist
 logutils
 flower
 uwsgitop

From f9871f32a3dc287b2c4d36349c0c8bff085c4fd6 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Wed, 16 May 2018 15:16:40 -0400
Subject: [PATCH 160/169] do not fail entire notification chain if one fails

---
 awx/main/tasks.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/awx/main/tasks.py b/awx/main/tasks.py
index f0c5adfef2..68dd21e804 100644
--- a/awx/main/tasks.py
+++ b/awx/main/tasks.py
@@ -255,7 +255,10 @@ def send_notifications(notification_list, job_id=None):
             notification.error = smart_str(e)
             update_fields.append('error')
         finally:
-            notification.save(update_fields=update_fields)
+            try:
+                notification.save(update_fields=update_fields)
+            except Exception as e:
+                logger.exception(six.text_type('Error saving notification {} result.').format(notification.id))
 
 
 @shared_task(bind=True, queue=settings.CELERY_DEFAULT_QUEUE)

From 2255ee5dbaf24819a0c6aee5a0b238dd8dac7bb8 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Wed, 16 May 2018 17:32:40 -0400
Subject: [PATCH 161/169] don't reset counters on job start

---
 awx/ui/client/features/output/index.controller.js | 1 -
 awx/ui/client/features/output/status.service.js   | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/features/output/index.controller.js b/awx/ui/client/features/output/index.controller.js
index a6761238c4..935d0a7c79 100644
--- a/awx/ui/client/features/output/index.controller.js
+++ b/awx/ui/client/features/output/index.controller.js
@@ -87,7 +87,6 @@ function init () {
             return shift().then(() => append(events, true));
         },
         onStart () {
-            status.resetCounts();
             status.setJobStatus('running');
         },
         onStop () {
diff --git a/awx/ui/client/features/output/status.service.js b/awx/ui/client/features/output/status.service.js
index a4e60c6822..29558c70df 100644
--- a/awx/ui/client/features/output/status.service.js
+++ b/awx/ui/client/features/output/status.service.js
@@ -26,9 +26,9 @@ function JobStatusService (moment, message) {
             running: false,
             stats: false,
             counts: {
-                plays: null,
-                tasks: null,
-                hosts: null,
+                plays: 0,
+                tasks: 0,
+                hosts: 0,
             },
             hosts: {},
             status: model.get('status'),

From c998fd6bcbf8460435b354bcaf843bd9222203c5 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Thu, 17 May 2018 07:43:09 -0400
Subject: [PATCH 162/169] fix flake8 introduced by new tests

---
 awx/main/tests/unit/models/test_survey_models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/main/tests/unit/models/test_survey_models.py b/awx/main/tests/unit/models/test_survey_models.py
index 330014d481..3bc06edc87 100644
--- a/awx/main/tests/unit/models/test_survey_models.py
+++ b/awx/main/tests/unit/models/test_survey_models.py
@@ -253,7 +253,7 @@ def test_optional_survey_question_defaults(
     ('password', 'foo', 5, {'extra_vars': {'x': ''}}, {'x': ''}),
     ('password', ENCRYPTED_SECRET, 5, {'extra_vars': {'x': '$encrypted$'}}, {}),
     ('password', ENCRYPTED_SECRET, 10, {'extra_vars': {'x': '$encrypted$'}}, {'x': ENCRYPTED_SECRET}),
-    ], ids=DistinctParametrize())
+], ids=DistinctParametrize())
 def test_survey_encryption_defaults(survey_spec_factory, question_type, default, maxlen, kwargs, expected):
     spec = survey_spec_factory([
         {

From 04767641af55ed5a3ae258b4d22522438bcd11ae Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Wed, 16 May 2018 16:43:29 -0400
Subject: [PATCH 163/169] isolate cache

---
 awx/conf/tests/__init__.py                    |  0
 awx/conf/tests/test_env.py                    |  6 +++
 awx/main/tests/conftest.py                    | 18 +++++++
 awx/main/tests/functional/conftest.py         |  9 ----
 .../task_management/test_scheduler.py         | 18 ++++---
 awx/main/tests/test_env.py                    |  6 +++
 .../tests/unit/models/test_survey_models.py   |  2 +-
 awx/main/tests/unit/utils/test_common.py      | 52 ++++++++-----------
 awx/main/utils/common.py                      | 11 ++--
 awx/settings/defaults.py                      | 19 +++----
 awx/settings/development.py                   | 10 ++++
 awx/sso/tests/test_env.py                     |  6 +++
 12 files changed, 93 insertions(+), 64 deletions(-)
 create mode 100644 awx/conf/tests/__init__.py
 create mode 100644 awx/conf/tests/test_env.py
 create mode 100644 awx/main/tests/test_env.py
 create mode 100644 awx/sso/tests/test_env.py

diff --git a/awx/conf/tests/__init__.py b/awx/conf/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/awx/conf/tests/test_env.py b/awx/conf/tests/test_env.py
new file mode 100644
index 0000000000..135c90d99b
--- /dev/null
+++ b/awx/conf/tests/test_env.py
@@ -0,0 +1,6 @@
+
+
+# Ensure that our autouse overwrites are working
+def test_cache(settings):
+    assert settings.CACHES['default']['BACKEND'] == 'django.core.cache.backends.locmem.LocMemCache'
+    assert settings.CACHES['default']['LOCATION'].startswith('unique-')
diff --git a/awx/main/tests/conftest.py b/awx/main/tests/conftest.py
index 946c930dc5..0c3cb513ec 100644
--- a/awx/main/tests/conftest.py
+++ b/awx/main/tests/conftest.py
@@ -106,3 +106,21 @@ def get_ssh_version(mocker):
 @pytest.fixture
 def job_template_with_survey_passwords_unit(job_template_with_survey_passwords_factory):
     return job_template_with_survey_passwords_factory(persisted=False)
+
+
+@pytest.fixture
+def mock_cache():
+    class MockCache(object):
+        cache = {}
+
+        def get(self, key, default=None):
+            return self.cache.get(key, default)
+
+        def set(self, key, value, timeout=60):
+            self.cache[key] = value
+
+        def delete(self, key):
+            del self.cache[key]
+
+    return MockCache()
+
diff --git a/awx/main/tests/functional/conftest.py b/awx/main/tests/functional/conftest.py
index d5b45cf728..28d7b65564 100644
--- a/awx/main/tests/functional/conftest.py
+++ b/awx/main/tests/functional/conftest.py
@@ -9,7 +9,6 @@ from six.moves import xrange
 
 # Django
 from django.core.urlresolvers import resolve
-from django.core.cache import cache
 from django.utils.six.moves.urllib.parse import urlparse
 from django.utils import timezone
 from django.contrib.auth.models import User
@@ -57,14 +56,6 @@ def swagger_autogen(requests=__SWAGGER_REQUESTS__):
     return requests
 
 
-@pytest.fixture(autouse=True)
-def clear_cache():
-    '''
-    Clear cache (local memory) for each test to prevent using cached settings.
-    '''
-    cache.clear()
-
-
 @pytest.fixture(scope="session", autouse=True)
 def celery_memory_broker():
     '''
diff --git a/awx/main/tests/functional/task_management/test_scheduler.py b/awx/main/tests/functional/task_management/test_scheduler.py
index 116deba3ad..82625533c7 100644
--- a/awx/main/tests/functional/task_management/test_scheduler.py
+++ b/awx/main/tests/functional/task_management/test_scheduler.py
@@ -241,15 +241,16 @@ def test_shared_dependencies_launch(default_instance_group, job_template_factory
 
 
 @pytest.mark.django_db
-def test_cleanup_interval():
-    assert cache.get('last_celery_task_cleanup') is None
+def test_cleanup_interval(mock_cache):
+    with mock.patch.multiple('awx.main.scheduler.task_manager.cache', get=mock_cache.get, set=mock_cache.set):
+        assert mock_cache.get('last_celery_task_cleanup') is None
 
-    TaskManager().cleanup_inconsistent_celery_tasks()
-    last_cleanup = cache.get('last_celery_task_cleanup')
-    assert isinstance(last_cleanup, datetime)
+        TaskManager().cleanup_inconsistent_celery_tasks()
+        last_cleanup = mock_cache.get('last_celery_task_cleanup')
+        assert isinstance(last_cleanup, datetime)
 
-    TaskManager().cleanup_inconsistent_celery_tasks()
-    assert cache.get('last_celery_task_cleanup') == last_cleanup
+        TaskManager().cleanup_inconsistent_celery_tasks()
+        assert cache.get('last_celery_task_cleanup') == last_cleanup
 
 
 class TestReaper():
@@ -326,7 +327,8 @@ class TestReaper():
     @pytest.mark.django_db
     @mock.patch.object(JobNotificationMixin, 'send_notification_templates')
     @mock.patch.object(TaskManager, 'get_active_tasks', lambda self: ([], []))
-    def test_cleanup_inconsistent_task(self, notify, active_tasks, considered_jobs, reapable_jobs, running_tasks, waiting_tasks, mocker):
+    def test_cleanup_inconsistent_task(self, notify, active_tasks, considered_jobs, reapable_jobs, running_tasks, waiting_tasks, mocker, settings):
+        settings.AWX_INCONSISTENT_TASK_INTERVAL = 0
         tm = TaskManager()
 
         tm.get_running_tasks = mocker.Mock(return_value=(running_tasks, waiting_tasks))
diff --git a/awx/main/tests/test_env.py b/awx/main/tests/test_env.py
new file mode 100644
index 0000000000..135c90d99b
--- /dev/null
+++ b/awx/main/tests/test_env.py
@@ -0,0 +1,6 @@
+
+
+# Ensure that our autouse overwrites are working
+def test_cache(settings):
+    assert settings.CACHES['default']['BACKEND'] == 'django.core.cache.backends.locmem.LocMemCache'
+    assert settings.CACHES['default']['LOCATION'].startswith('unique-')
diff --git a/awx/main/tests/unit/models/test_survey_models.py b/awx/main/tests/unit/models/test_survey_models.py
index 330014d481..3bc06edc87 100644
--- a/awx/main/tests/unit/models/test_survey_models.py
+++ b/awx/main/tests/unit/models/test_survey_models.py
@@ -253,7 +253,7 @@ def test_optional_survey_question_defaults(
     ('password', 'foo', 5, {'extra_vars': {'x': ''}}, {'x': ''}),
     ('password', ENCRYPTED_SECRET, 5, {'extra_vars': {'x': '$encrypted$'}}, {}),
     ('password', ENCRYPTED_SECRET, 10, {'extra_vars': {'x': '$encrypted$'}}, {'x': ENCRYPTED_SECRET}),
-    ], ids=DistinctParametrize())
+], ids=DistinctParametrize())
 def test_survey_encryption_defaults(survey_spec_factory, question_type, default, maxlen, kwargs, expected):
     spec = survey_spec_factory([
         {
diff --git a/awx/main/tests/unit/utils/test_common.py b/awx/main/tests/unit/utils/test_common.py
index fa4a038037..bb98b18bec 100644
--- a/awx/main/tests/unit/utils/test_common.py
+++ b/awx/main/tests/unit/utils/test_common.py
@@ -7,10 +7,10 @@ import pytest
 from uuid import uuid4
 import json
 import yaml
+import mock
 
 from backports.tempfile import TemporaryDirectory
 from django.conf import settings
-from django.core.cache import cache
 
 from rest_framework.exceptions import ParseError
 
@@ -26,14 +26,6 @@ from awx.main.models import (
 )
 
 
-@pytest.fixture(autouse=True)
-def clear_cache():
-    '''
-    Clear cache (local memory) for each test to prevent using cached settings.
-    '''
-    cache.clear()
-
-
 @pytest.mark.parametrize('input_, output', [
     ({"foo": "bar"}, {"foo": "bar"}),
     ('{"foo": "bar"}', {"foo": "bar"}),
@@ -114,46 +106,48 @@ def test_get_type_for_model(model, name):
 
 
 @pytest.fixture
-def memoized_function(mocker):
-    @common.memoize(track_function=True)
-    def myfunction(key, value):
-        if key not in myfunction.calls:
-            myfunction.calls[key] = 0
+def memoized_function(mocker, mock_cache):
+    with mock.patch('awx.main.utils.common.get_memoize_cache', return_value=mock_cache):
+        @common.memoize(track_function=True)
+        def myfunction(key, value):
+            if key not in myfunction.calls:
+                myfunction.calls[key] = 0
 
-        myfunction.calls[key] += 1
+            myfunction.calls[key] += 1
 
-        if myfunction.calls[key] == 1:
-            return value
-        else:
-            return '%s called %s times' % (value, myfunction.calls[key])
-    myfunction.calls = dict()
-    return myfunction
+            if myfunction.calls[key] == 1:
+                return value
+            else:
+                return '%s called %s times' % (value, myfunction.calls[key])
+        myfunction.calls = dict()
+        return myfunction
 
 
-def test_memoize_track_function(memoized_function):
+def test_memoize_track_function(memoized_function, mock_cache):
     assert memoized_function('scott', 'scotterson') == 'scotterson'
-    assert cache.get('myfunction') == {u'scott-scotterson': 'scotterson'}
+    assert mock_cache.get('myfunction') == {u'scott-scotterson': 'scotterson'}
     assert memoized_function('scott', 'scotterson') == 'scotterson'
 
     assert memoized_function.calls['scott'] == 1
 
     assert memoized_function('john', 'smith') == 'smith'
-    assert cache.get('myfunction') == {u'scott-scotterson': 'scotterson', u'john-smith': 'smith'}
+    assert mock_cache.get('myfunction') == {u'scott-scotterson': 'scotterson', u'john-smith': 'smith'}
     assert memoized_function('john', 'smith') == 'smith'
-    
+
     assert memoized_function.calls['john'] == 1
 
 
-def test_memoize_delete(memoized_function):
+def test_memoize_delete(memoized_function, mock_cache):
     assert memoized_function('john', 'smith') == 'smith'
     assert memoized_function('john', 'smith') == 'smith'
     assert memoized_function.calls['john'] == 1
 
-    assert cache.get('myfunction') == {u'john-smith': 'smith'}
+    assert mock_cache.get('myfunction') == {u'john-smith': 'smith'}
 
-    common.memoize_delete('myfunction')
+    with mock.patch('awx.main.utils.common.memoize_delete', side_effect=mock_cache.delete):
+        common.memoize_delete('myfunction')
 
-    assert cache.get('myfunction') is None
+    assert mock_cache.get('myfunction') is None
 
     assert memoized_function('john', 'smith') == 'smith called 2 times'
     assert memoized_function.calls['john'] == 2
diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py
index a024e7d649..c9914cd1c3 100644
--- a/awx/main/utils/common.py
+++ b/awx/main/utils/common.py
@@ -127,12 +127,16 @@ class IllegalArgumentError(ValueError):
     pass
 
 
+def get_memoize_cache():
+    from django.core.cache import cache
+    return cache
+
+
 def memoize(ttl=60, cache_key=None, track_function=False):
     '''
     Decorator to wrap a function and cache its result.
     '''
-    from django.core.cache import cache
-
+    cache = get_memoize_cache()
 
     def _memoizer(f, *args, **kwargs):
         if cache_key and track_function:
@@ -160,8 +164,7 @@ def memoize(ttl=60, cache_key=None, track_function=False):
 
 
 def memoize_delete(function_name):
-    from django.core.cache import cache
-
+    cache = get_memoize_cache()
     return cache.delete(function_name)
 
 
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 66e9c3ee9a..978cbf05c0 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -537,19 +537,12 @@ ASGI_AMQP = {
 }
 
 # Django Caching Configuration
-if is_testing():
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-        },
-    }
-else:
-    CACHES = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-            'LOCATION': 'memcached:11211',
-        },
-    }
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': 'memcached:11211',
+    },
+}
 
 # Social Auth configuration.
 SOCIAL_AUTH_STRATEGY = 'social_django.strategy.DjangoStrategy'
diff --git a/awx/settings/development.py b/awx/settings/development.py
index e7dc0152f6..4a2bd1aa8d 100644
--- a/awx/settings/development.py
+++ b/awx/settings/development.py
@@ -9,6 +9,7 @@ import socket
 import copy
 import sys
 import traceback
+import random
 
 # Centos-7 doesn't include the svg mime type
 # /usr/lib64/python/mimetypes.py
@@ -20,6 +21,15 @@ from split_settings.tools import optional, include
 # Load default settings.
 from defaults import *  # NOQA
 
+# don't use memcache when running tests
+if "pytest" in sys.modules:
+    CACHES = {
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+            'LOCATION': 'unique-{}'.format(random.randint(0, sys.maxint)),
+        },
+    }
+
 # awx-manage shell_plus --notebook
 NOTEBOOK_ARGUMENTS = [
     '--NotebookApp.token=',
diff --git a/awx/sso/tests/test_env.py b/awx/sso/tests/test_env.py
new file mode 100644
index 0000000000..135c90d99b
--- /dev/null
+++ b/awx/sso/tests/test_env.py
@@ -0,0 +1,6 @@
+
+
+# Ensure that our autouse overwrites are working
+def test_cache(settings):
+    assert settings.CACHES['default']['BACKEND'] == 'django.core.cache.backends.locmem.LocMemCache'
+    assert settings.CACHES['default']['LOCATION'].startswith('unique-')

From b6923bdbebc21ca5a8462bde0dcd3e8cd018df85 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Wed, 16 May 2018 16:17:30 -0400
Subject: [PATCH 164/169] speed up a handful of really slow stdout tests

before: 59 passed in 95.20 seconds
after: 59 passed in 11.09 seconds
---
 awx/main/tests/functional/api/test_unified_jobs_stdout.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/awx/main/tests/functional/api/test_unified_jobs_stdout.py b/awx/main/tests/functional/api/test_unified_jobs_stdout.py
index f399dca389..3f1a5760fc 100644
--- a/awx/main/tests/functional/api/test_unified_jobs_stdout.py
+++ b/awx/main/tests/functional/api/test_unified_jobs_stdout.py
@@ -8,6 +8,7 @@ import tempfile
 
 from django.conf import settings
 from django.db.backends.sqlite3.base import SQLiteCursorWrapper
+import mock
 import pytest
 
 from awx.api.versioning import reverse
@@ -184,6 +185,7 @@ def test_text_stdout_with_max_stdout(sqlite_copy_expert, get, admin):
     [_mk_inventory_update, InventoryUpdateEvent, 'inventory_update', 'api:inventory_update_stdout'],
 ])
 @pytest.mark.parametrize('fmt', ['txt', 'ansi'])
+@mock.patch('awx.main.redact.UriCleaner.SENSITIVE_URI_PATTERN', mock.Mock(**{'search.return_value': None}))  # really slow for large strings
 def test_max_bytes_display(sqlite_copy_expert, Parent, Child, relation, view, fmt, get, admin):
     job = Parent()
     job.save()
@@ -231,6 +233,7 @@ def test_legacy_result_stdout_text_fallback(Cls, view, fmt, get, admin):
     [_mk_inventory_update, 'api:inventory_update_stdout']
 ])
 @pytest.mark.parametrize('fmt', ['txt', 'ansi'])
+@mock.patch('awx.main.redact.UriCleaner.SENSITIVE_URI_PATTERN', mock.Mock(**{'search.return_value': None}))  # really slow for large strings
 def test_legacy_result_stdout_with_max_bytes(Cls, view, fmt, get, admin):
     job = Cls()
     job.save()

From 40ef30a91445771de28d2a9d2256e0c127c9a598 Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Thu, 17 May 2018 13:35:35 -0400
Subject: [PATCH 165/169] reduce chance of collision on cache namespace

---
 awx/settings/development.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/awx/settings/development.py b/awx/settings/development.py
index 4a2bd1aa8d..9cf0d92179 100644
--- a/awx/settings/development.py
+++ b/awx/settings/development.py
@@ -10,6 +10,7 @@ import copy
 import sys
 import traceback
 import random
+import uuid
 
 # Centos-7 doesn't include the svg mime type
 # /usr/lib64/python/mimetypes.py
@@ -26,7 +27,7 @@ if "pytest" in sys.modules:
     CACHES = {
         'default': {
             'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-            'LOCATION': 'unique-{}'.format(random.randint(0, sys.maxint)),
+            'LOCATION': 'unique-{}'.format(str(uuid.uuid4())),
         },
     }
 

From 88bb98c96755e07b9d12d5c148dce7f89a288953 Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Thu, 17 May 2018 13:38:25 -0400
Subject: [PATCH 166/169] flake8

---
 awx/settings/development.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/awx/settings/development.py b/awx/settings/development.py
index 9cf0d92179..0061157ec4 100644
--- a/awx/settings/development.py
+++ b/awx/settings/development.py
@@ -9,7 +9,6 @@ import socket
 import copy
 import sys
 import traceback
-import random
 import uuid
 
 # Centos-7 doesn't include the svg mime type

From d8615df47f6d8fcbd5f5c342bf5b7d56b9cd15fc Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Thu, 17 May 2018 14:29:10 -0400
Subject: [PATCH 167/169] postgres back tests can't do this

---
 awx/main/tests/functional/__init__.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/awx/main/tests/functional/__init__.py b/awx/main/tests/functional/__init__.py
index 405018d1a4..262a142790 100644
--- a/awx/main/tests/functional/__init__.py
+++ b/awx/main/tests/functional/__init__.py
@@ -1,6 +1,7 @@
 from django.db import connection
 from django.db.models.signals import post_migrate
 from django.apps import apps
+from django.conf import settings
 
 
 def app_post_migration(sender, app_config, **kwargs):
@@ -17,7 +18,8 @@ def app_post_migration(sender, app_config, **kwargs):
         )
 
 
-post_migrate.connect(app_post_migration, sender=apps.get_app_config('main'))
+if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3':
+    post_migrate.connect(app_post_migration, sender=apps.get_app_config('main'))
 
 
 

From 4031c888de3b25d8ae4f996562bcac5b48ff37c8 Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Thu, 17 May 2018 14:37:32 -0400
Subject: [PATCH 168/169] fork process may finish before cancel callback

* The "should we cancel?" callback check is only called while the
subprocess (child) is alive. If the child executes quickly, the cancel
callback has no chance to run.
* call a subprocess that takes longer to run like sleep 2
---
 awx/main/tests/unit/expect/test_expect.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/main/tests/unit/expect/test_expect.py b/awx/main/tests/unit/expect/test_expect.py
index 3978cb14c5..a43775ad33 100644
--- a/awx/main/tests/unit/expect/test_expect.py
+++ b/awx/main/tests/unit/expect/test_expect.py
@@ -90,7 +90,7 @@ def test_cancel_callback_error():
 
     extra_fields = {}
     status, rc = run.run_pexpect(
-        ['ls', '-la'],
+        ['sleep', '2'],
         HERE,
         {},
         stdout,

From 51f66b8c0a08c7b2cb783716f59b469d3572fa49 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Thu, 17 May 2018 13:16:48 -0400
Subject: [PATCH 169/169] filter `/api/v2/users/N/tokens/` to only show tokens
 for _that_ user

see: https://github.com/ansible/tower/issues/1773
---
 awx/api/urls/user.py                        |  4 ++--
 awx/api/views.py                            | 12 ++++++++++++
 awx/main/tests/functional/api/test_oauth.py |  9 +++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/awx/api/urls/user.py b/awx/api/urls/user.py
index 3e37de1dda..9ecebbb044 100644
--- a/awx/api/urls/user.py
+++ b/awx/api/urls/user.py
@@ -15,7 +15,7 @@ from awx.api.views import (
     UserActivityStreamList,
     UserAccessList,
     OAuth2ApplicationList,
-    OAuth2TokenList,
+    OAuth2UserTokenList,
     OAuth2PersonalTokenList,
     UserAuthorizedTokenList,
 )
@@ -32,7 +32,7 @@ urls = [
     url(r'^(?P<pk>[0-9]+)/activity_stream/$', UserActivityStreamList.as_view(), name='user_activity_stream_list'),
     url(r'^(?P<pk>[0-9]+)/access_list/$', UserAccessList.as_view(), name='user_access_list'),
     url(r'^(?P<pk>[0-9]+)/applications/$', OAuth2ApplicationList.as_view(), name='o_auth2_application_list'),
-    url(r'^(?P<pk>[0-9]+)/tokens/$', OAuth2TokenList.as_view(), name='o_auth2_token_list'),
+    url(r'^(?P<pk>[0-9]+)/tokens/$', OAuth2UserTokenList.as_view(), name='o_auth2_token_list'),
     url(r'^(?P<pk>[0-9]+)/authorized_tokens/$', UserAuthorizedTokenList.as_view(), name='user_authorized_token_list'),
     url(r'^(?P<pk>[0-9]+)/personal_tokens/$', OAuth2PersonalTokenList.as_view(), name='o_auth2_personal_token_list'),
     
diff --git a/awx/api/views.py b/awx/api/views.py
index 154fb84e88..5f1d8b22af 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -1598,6 +1598,18 @@ class OAuth2TokenList(ListCreateAPIView):
     model = OAuth2AccessToken
     serializer_class = OAuth2TokenSerializer
     swagger_topic = 'Authentication'
+
+
+class OAuth2UserTokenList(SubListCreateAPIView):
+
+    view_name = _("OAuth2 User Tokens")
+
+    model = OAuth2AccessToken
+    serializer_class = OAuth2TokenSerializer
+    parent_model = User
+    relationship = 'main_oauth2accesstoken'
+    parent_key = 'user'
+    swagger_topic = 'Authentication'
     
     
 class OAuth2AuthorizedTokenList(SubListCreateAPIView):
diff --git a/awx/main/tests/functional/api/test_oauth.py b/awx/main/tests/functional/api/test_oauth.py
index 4110701e6a..7e745213c8 100644
--- a/awx/main/tests/functional/api/test_oauth.py
+++ b/awx/main/tests/functional/api/test_oauth.py
@@ -172,3 +172,12 @@ def test_oauth_application_delete(oauth_application, post, delete, admin):
     assert Application.objects.filter(client_id=oauth_application.client_id).count() == 0
     assert RefreshToken.objects.filter(application=oauth_application).count() == 0
     assert AccessToken.objects.filter(application=oauth_application).count() == 0
+
+
+@pytest.mark.django_db
+def test_oauth_list_user_tokens(oauth_application, post, get, admin, alice):
+    for user in (admin, alice):
+        url = reverse('api:o_auth2_token_list', kwargs={'pk': user.pk})
+        post(url, {'scope': 'read'}, user, expect=201)
+        response = get(url, admin, expect=200)
+        assert response.data['count'] == 1