Merge branch 'release_3.1.0' into fix-4250

2026-05-18 06:47:41 -02:30 · 2017-01-11 09:05:26 -05:00
parent fb1e00e3ae bb641d846d
commit 422a868982
56 changed files with 615 additions and 121 deletions
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -251,6 +251,7 @@ class BaseSerializer(serializers.ModelSerializer):
            'inventory_update': _('Inventory Sync'),
            'system_job': _('Management Job'),
            'workflow_job': _('Workflow Job'),
+            'workflow_job_template': _('Workflow Template'),
        }
        choices = []
        for t in self.get_types():
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -1553,12 +1553,14 @@ class InventoryScriptList(ListCreateAPIView):

    model = CustomInventoryScript
    serializer_class = CustomInventoryScriptSerializer
+    new_in_210 = True


 class InventoryScriptDetail(RetrieveUpdateDestroyAPIView):

    model = CustomInventoryScript
    serializer_class = CustomInventoryScriptSerializer
+    new_in_210 = True

    def destroy(self, request, *args, **kwargs):
        instance = self.get_object()
--- a/awx/main/management/commands/cleanup_facts.py
+++ b/awx/main/management/commands/cleanup_facts.py
@@ -96,12 +96,12 @@ class Command(BaseCommand):
    option_list = BaseCommand.option_list + (
        make_option('--older_than',
                    dest='older_than',
-                    default=None,
-                    help='Specify the relative time to consider facts older than (w)eek (d)ay or (y)ear (i.e. 5d, 2w, 1y).'),
+                    default='30d',
+                    help='Specify the relative time to consider facts older than (w)eek (d)ay or (y)ear (i.e. 5d, 2w, 1y). Defaults to 30d.'),
        make_option('--granularity',
                    dest='granularity',
-                    default=None,
-                    help='Window duration to group same hosts by for deletion (w)eek (d)ay or (y)ear (i.e. 5d, 2w, 1y).'),
+                    default='1w',
+                    help='Window duration to group same hosts by for deletion (w)eek (d)ay or (y)ear (i.e. 5d, 2w, 1y). Defaults to 1w.'),
        make_option('--module',
                    dest='module',
                    default=None,
--- a/awx/main/management/commands/inventory_import.py
+++ b/awx/main/management/commands/inventory_import.py
@@ -64,7 +64,7 @@ class MemObject(object):
        all_vars = {}
        files_found = 0
        for suffix in ('', '.yml', '.yaml', '.json'):
-            path = ''.join([base_path, suffix])
+            path = ''.join([base_path, suffix]).encode("utf-8")
            if not os.path.exists(path):
                continue
            if not os.path.isfile(path):
@@ -462,7 +462,7 @@ class ExecutableJsonLoader(BaseLoader):
        # to set their variables
        for k,v in self.all_group.all_hosts.iteritems():
            if 'hostvars' not in _meta:
-                data = self.command_to_json([self.source, '--host', k])
+                data = self.command_to_json([self.source, '--host', k.encode("utf-8")])
            else:
                data = _meta['hostvars'].get(k, {})
            if isinstance(data, dict):
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -44,11 +44,10 @@
    color: @list-header-txt;
    font-size: 14px;
    font-weight: bold;
-    padding-bottom: 25px;
-    min-height: 45px;
    word-break: break-all;
    max-width: 90%;
    word-wrap: break-word;
+    margin-bottom: 20px;
 }

 .Form-secondaryTitle{
--- a/awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html
+++ b/awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html
@@ -6,7 +6,7 @@
                <div class="List-header">
                    <div class="List-title">
                        <div class="List-titleText ng-binding">
-                            {{ object.name }}
+                            {{ object.name || object.username }}
                            <div class="List-titleLockup"></div>
                            Add Permissions
                        </div>
--- a/awx/ui/client/src/access/add-rbac-user-team/rbac-selected-list.directive.js
+++ b/awx/ui/client/src/access/add-rbac-user-team/rbac-selected-list.directive.js
@@ -42,8 +42,6 @@ export default ['$compile','templateUrl', 'i18n', 'generateList',

                list.listTitleBadge = false;

-                // @issue - fix field.columnClass values for this view
-
                switch(scope.resourceType){

                    case 'projects':
@@ -51,6 +49,8 @@ export default ['$compile','templateUrl', 'i18n', 'generateList',
                            name: list.fields.name,
                            scm_type: list.fields.scm_type
                        };
+                        list.fields.name.columnClass = 'col-md-5 col-sm-5 col-xs-10';
+                        list.fields.scm_type.columnClass = 'col-md-5 col-sm-5 hidden-xs';
                        break;

                    case 'inventories':
@@ -58,6 +58,8 @@ export default ['$compile','templateUrl', 'i18n', 'generateList',
                            name: list.fields.name,
                            organization: list.fields.organization
                        };
+                        list.fields.name.columnClass = 'col-md-5 col-sm-5 col-xs-10';
+                        list.fields.organization.columnClass = 'col-md-5 col-sm-5 hidden-xs';
                        break;

                    case 'job_templates':
@@ -67,6 +69,8 @@ export default ['$compile','templateUrl', 'i18n', 'generateList',
                            name: list.fields.name,
                            description: list.fields.description
                        };
+                        list.fields.name.columnClass = 'col-md-5 col-sm-5 col-xs-10';
+                        list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
                        break;

                    case 'workflow_templates':
@@ -77,12 +81,16 @@ export default ['$compile','templateUrl', 'i18n', 'generateList',
                            name: list.fields.name,
                            description: list.fields.description
                        };
+                        list.fields.name.columnClass = 'col-md-5 col-sm-5 col-xs-10';
+                        list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
                        break;
                    case 'credentials':
                        list.fields = {
                            name: list.fields.name,
                            description: list.fields.description
                        };
+                        list.fields.name.columnClass = 'col-md-5 col-sm-5 col-xs-10';
+                        list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
                }

                list.fields = _.each(list.fields, (field) => field.nosort = true);
--- a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html
+++ b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html
@@ -7,7 +7,7 @@
                <div class="List-header">
                    <div class="List-title">
                        <div class="List-titleText ng-binding">
-                            {{ owner.name }}
+                            {{ owner.name || owner.username }}
                            <div class="List-titleLockup"></div>
                            Add Permissions
                        </div>
--- a/awx/ui/client/src/access/add-rbac.block.less
+++ b/awx/ui/client/src/access/add-rbac.block.less
@@ -51,6 +51,10 @@
    padding-top: 20px;
 }

+.AddPermissions-list {
+    margin-bottom: 20px;
+}
+
 .AddPermissions-list .List-searchRow {
    height: 0px;
 }
--- a/awx/ui/client/src/access/rbac-multiselect/permissionsUsers.list.js
+++ b/awx/ui/client/src/access/rbac-multiselect/permissionsUsers.list.js
@@ -34,7 +34,7 @@
            username: {
                key: true,
                label: 'Username',
-                columnClass: 'col-md-3 col-sm-3 col-xs-9'
+                columnClass: 'col-md-5 col-sm-5 col-xs-11'
            },
        },

--- a/awx/ui/client/src/access/rbac-multiselect/rbac-multiselect-list.directive.js
+++ b/awx/ui/client/src/access/rbac-multiselect/rbac-multiselect-list.directive.js
@@ -43,6 +43,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
                        name: list.fields.name,
                        scm_type: list.fields.scm_type
                    };
+                    list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
+                    list.fields.scm_type.columnClass = 'col-md-5 col-sm-5 hidden-xs';
                    break;

                case 'Inventories':
@@ -50,6 +52,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
                        name: list.fields.name,
                        organization: list.fields.organization
                    };
+                    list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
+                    list.fields.organization.columnClass = 'col-md-5 col-sm-5 hidden-xs';
                    break;

                case 'JobTemplates':
@@ -59,6 +63,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
                        name: list.fields.name,
                        description: list.fields.description
                    };
+                    list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
+                    list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
                    break;

                case 'WorkflowTemplates':
@@ -69,6 +75,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
                        name: list.fields.name,
                        description: list.fields.description
                    };
+                    list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
+                    list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
                    break;
                case 'Users':
                    list.fields = {
@@ -76,12 +84,17 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
                        first_name: list.fields.first_name,
                        last_name: list.fields.last_name
                    };
+                    list.fields.username.columnClass = 'col-md-5 col-sm-5 col-xs-11';
+                    list.fields.first_name.columnClass = 'col-md-3 col-sm-3 hidden-xs';
+                    list.fields.last_name.columnClass = 'col-md-3 col-sm-3 hidden-xs';
                    break;
                default:
                    list.fields = {
                        name: list.fields.name,
                        description: list.fields.description
                    };
+                    list.fields.name.columnClass = 'col-md-6 col-sm-6 col-xs-11';
+                    list.fields.description.columnClass = 'col-md-5 col-sm-5 hidden-xs';
            }

            list_html = generateList.build({
--- a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less
+++ b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less
@@ -35,5 +35,6 @@
    margin-bottom: 0;
    max-height: 200px;
    overflow: scroll;
+    overflow-x: auto;
    color: @as-detail-changes-txt;
 }
--- a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html
+++ b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html
@@ -22,7 +22,7 @@
              </div>
          </div>
          <div class="Modal-footer">
-              <a href="#" data-target="#stream-detail-modal" data-dismiss="modal" id="action_cancel_btn" class="btn btn-primary StreamDetail-actionButton">OK</a>
+              <a href="#" data-target="#stream-detail-modal" data-dismiss="modal" id="action_cancel_btn" class="btn btn-default StreamDetail-actionButton">OK</a>
          </div>
      </div>
   </div>
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-azure.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-azure.form.js
@@ -16,7 +16,8 @@
                 reset: 'SOCIAL_AUTH_AZUREAD_OAUTH2_KEY'
             },
             SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET: {
-                 type: 'text',
+                 type: 'sensitive',
+                 hasShowInputButton: true,
                 reset: 'SOCIAL_AUTH_AZUREAD_OAUTH2_SECRET'
             },
             SOCIAL_AUTH_AZUREAD_OAUTH2_ORGANIZATION_MAP: {
@@ -38,8 +39,8 @@
         buttons: {
             reset: {
                 ngClick: 'vm.resetAllConfirm()',
-                 label: i18n._('Reset All'),
-                 class: 'Form-button--left Form-cancelButton'
+                 label: i18n._('Revert all to default'),
+                 class: 'Form-resetAll'
             },
             cancel: {
                 ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-org.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-org.form.js
@@ -16,7 +16,8 @@ export default ['i18n', function(i18n) {
                reset: 'SOCIAL_AUTH_GITHUB_ORG_KEY'
            },
            SOCIAL_AUTH_GITHUB_ORG_SECRET: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                reset: 'SOCIAL_AUTH_GITHUB_ORG_SECRET'
            },
            SOCIAL_AUTH_GITHUB_ORG_NAME: {
@@ -28,8 +29,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-team.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github-team.form.js
@@ -16,7 +16,8 @@ export default ['i18n', function(i18n) {
                reset: 'SOCIAL_AUTH_GITHUB_TEAM_KEY'
            },
            SOCIAL_AUTH_GITHUB_TEAM_SECRET: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                reset: 'SOCIAL_AUTH_GITHUB_TEAM_SECRET'
            },
            SOCIAL_AUTH_GITHUB_TEAM_ID: {
@@ -28,8 +29,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-github.form.js
@@ -16,7 +16,8 @@ export default ['i18n', function(i18n) {
                reset: 'SOCIAL_AUTH_GITHUB_KEY'
            },
            SOCIAL_AUTH_GITHUB_SECRET: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                reset: 'SOCIAL_AUTH_GITHUB_SECRET'
            }
        },
@@ -24,8 +25,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-google-oauth2.form.js
@@ -16,7 +16,8 @@ export default ['i18n', function(i18n) {
                reset: 'SOCIAL_AUTH_GOOGLE_OAUTH2_KEY'
            },
            SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                reset: 'SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET'
            },
            SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS: {
@@ -36,8 +37,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-ldap.form.js
@@ -21,7 +21,8 @@ export default ['i18n', function(i18n) {
                reset: 'AUTH_LDAP_BIND_DN'
            },
            AUTH_LDAP_BIND_PASSWORD: {
-                type: 'password'
+                type: 'sensitive',
+                hasShowInputButton: true,
            },
            AUTH_LDAP_USER_SEARCH: {
                type: 'textarea',
@@ -84,8 +85,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-radius.form.js
@@ -21,7 +21,8 @@ export default ['i18n', function(i18n) {
                reset: 'RADIUS_PORT'
            },
            RADIUS_SECRET: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                reset: 'RADIUS_SECRET'
            }
        },
@@ -29,8 +30,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
@@ -20,7 +20,8 @@ export default ['i18n', function(i18n) {
                reset: 'SOCIAL_AUTH_SAML_SP_PUBLIC_CERT'
            },
            SOCIAL_AUTH_SAML_SP_PRIVATE_KEY: {
-                type: 'text',
+                type: 'sensitive',
+                hasShowInputButton: true,
                reset: 'SOCIAL_AUTH_SAML_SP_PRIVATE_KEY'
            },
            SOCIAL_AUTH_SAML_ORG_INFO: {
@@ -56,8 +57,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/configuration.block.less
+++ b/awx/ui/client/src/configuration/configuration.block.less
@@ -12,6 +12,19 @@
    float: right
 }

+.Form-resetAll {
+    border: none;
+    padding: 0;
+    background-color: @white;
+    margin-right: auto;
+    color: @default-link;
+    font-size: 12px;
+
+    &:hover {
+        color: @default-link-hov;
+    }
+}
+
 .Form-tab {
    min-width: 77px;
 }
--- a/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js
+++ b/awx/ui/client/src/configuration/jobs-form/configuration-jobs.form.js
@@ -64,8 +64,8 @@
         buttons: {
             reset: {
                 ngClick: 'vm.resetAllConfirm()',
-                 label: i18n._('Reset All'),
-                 class: 'Form-button--left Form-cancelButton'
+                 label: i18n._('Revert all to default'),
+                 class: 'Form-resetAll'
             },
             cancel: {
                 ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/system-form/sub-forms/system-activity-stream.form.js
+++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-activity-stream.form.js
@@ -22,8 +22,8 @@
         buttons: {
             reset: {
                 ngClick: 'vm.resetAllConfirm()',
-                 label: i18n._('Reset All'),
-                 class: 'Form-button--left Form-cancelButton'
+                 label: i18n._('Revert all to default'),
+                 class: 'Form-resetAll'
             },
             cancel: {
                 ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js
+++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-logging.form.js
@@ -30,7 +30,8 @@
                 reset: 'LOG_AGGREGATOR_USERNAME'
             },
             LOG_AGGREGATOR_PASSWORD: {
-                 type: 'text',
+                 type: 'sensitive',
+                 hasShowInputButton: true,
                 reset: 'LOG_AGGREGATOR_PASSWORD'
             },
             LOG_AGGREGATOR_LOGGERS: {
@@ -48,8 +49,8 @@
         buttons: {
             reset: {
                 ngClick: 'vm.resetAllConfirm()',
-                 label: i18n._('Reset All'),
-                 class: 'Form-button--left Form-cancelButton'
+                 label: i18n._('Revert all to default'),
+                 class: 'Form-resetAll'
             },
             cancel: {
                 ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/system-form/sub-forms/system-misc.form.js
+++ b/awx/ui/client/src/configuration/system-form/sub-forms/system-misc.form.js
@@ -26,8 +26,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
+++ b/awx/ui/client/src/configuration/ui-form/configuration-ui.form.js
@@ -32,8 +32,8 @@ export default ['i18n', function(i18n) {
        buttons: {
            reset: {
                ngClick: 'vm.resetAllConfirm()',
-                label: i18n._('Reset All'),
-                class: 'Form-button--left Form-cancelButton'
+                label: i18n._('Revert all to default'),
+                class: 'Form-resetAll'
            },
            cancel: {
                ngClick: 'vm.formCancel()',
--- a/awx/ui/client/src/controllers/Credentials.js
+++ b/awx/ui/client/src/controllers/Credentials.js
@@ -283,7 +283,7 @@ CredentialsAdd.$inject = ['$scope', '$rootScope', '$compile', '$location',
 export function CredentialsEdit($scope, $rootScope, $compile, $location, $log,
    $stateParams, CredentialForm, Rest, Alert, ProcessErrors, ClearScope, Prompt,
    GetBasePath, GetChoices, KindChange, Empty, OwnerChange, FormSave, Wait,
-    $state, CreateSelect2, Authorization) {
+    $state, CreateSelect2, Authorization, i18n) {

    ClearScope();

@@ -336,13 +336,14 @@ export function CredentialsEdit($scope, $rootScope, $compile, $location, $log,
                });
        }

-        // if the credential is assigned to an organization, allow permission delegation
-        // do NOT use $scope.organization in a view directive to determine if a credential is associated with an org
-        // @todo why not? ^ and what is this type check for a number doing - should this be a type check for undefined?
-        $scope.disablePermissionAssignment = typeof($scope.organization) === 'number' ? false : true;
-        if ($scope.disablePermissionAssignment) {
-            $scope.permissionsTooltip = 'Credentials are only shared within an organization. Assign credentials to an organization to delegate credential permissions. The organization cannot be edited after credentials are assigned.';
-        }
+        $scope.$watch('organization', function(val) {
+            if (val === undefined) {
+                $scope.permissionsTooltip = i18n._('Credentials are only shared within an organization. Assign credentials to an organization to delegate credential permissions. The organization cannot be edited after credentials are assigned.');
+            } else {
+                $scope.permissionsTooltip = '';
+            }
+        });
+
        setAskCheckboxes();
        KindChange({
            scope: $scope,
@@ -613,5 +614,5 @@ CredentialsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location',
    '$log', '$stateParams', 'CredentialForm', 'Rest', 'Alert',
    'ProcessErrors', 'ClearScope', 'Prompt', 'GetBasePath', 'GetChoices',
    'KindChange', 'Empty', 'OwnerChange',
-    'FormSave', 'Wait', '$state', 'CreateSelect2', 'Authorization'
+    'FormSave', 'Wait', '$state', 'CreateSelect2', 'Authorization', 'i18n',
 ];
--- a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less
+++ b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less
@@ -32,34 +32,21 @@
 }

 .DashboardList-viewAll {
-    color: @btn-txt;
-    background-color: @btn-bg;
-    font-size: 12px;
-    border: 1px solid @default-icon-hov;
-    border-radius: 5px;
+    font-size: 11px;
    margin-right: 15px;
-    margin-top: 10px;
+    margin-top: 13px;
    margin-bottom: 10px;
    padding-left: 10px;
    padding-right: 10px;
    padding-bottom: 5px;
    padding-top: 5px;
-    transition: background-color 0.2s;
-}
-
-.DashboardList-viewAll:hover {
-    color: @btn-txt;
-    background-color: @btn-bg-hov;
-}
-
-.DashboardList-viewAll:focus {
-    color: @btn-txt;
 }

 .DashboardList-container {
    flex: 1;
    width: 100%;
    padding: 20px;
+    padding-top: 0;
 }

 .DashboardList-tableHeader--name {
--- a/awx/ui/client/src/forms/Credentials.js
+++ b/awx/ui/client/src/forms/Credentials.js
@@ -420,7 +420,9 @@ export default

            related: {
                permissions: {
-                    disabled: 'disablePermissionAssignment',
+                    disabled: '(organization === undefined ? true : false)',
+                    // Do not transition the state if organization is undefined
+                    ngClick: `(organization === undefined ? true : false)||$state.go('credentials.edit.permissions')`,
                    awToolTip: '{{permissionsTooltip}}',
                    dataTipWatch: 'permissionsTooltip',
                    dataPlacement: 'top',
--- a/awx/ui/client/src/forms/Groups.js
+++ b/awx/ui/client/src/forms/Groups.js
@@ -43,7 +43,7 @@ export default
                    label: 'Variables',
                    type: 'textarea',
                    class: 'Form-textAreaLabel Form-formGroup--fullWidth',
-                    rows: 12,
+                    rows: 6,
                    'default': '---',
                    dataTitle: 'Group Variables',
                    dataPlacement: 'right',
--- a/awx/ui/client/src/forms/Inventories.js
+++ b/awx/ui/client/src/forms/Inventories.js
@@ -78,7 +78,7 @@ angular.module('InventoryFormDefinition', ['ScanJobsListDefinition'])
            },
            close: {
                ngClick: 'formCancel()',
-                ngHide: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
+                ngShow: '!(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
            },
            save: {
                ngClick: 'formSave()',
--- a/awx/ui/client/src/helpers/Jobs.js
+++ b/awx/ui/client/src/helpers/Jobs.js
@@ -233,7 +233,7 @@ export default
                    hdr: hdr,
                    body: (action_label === 'cancel' || job.status === 'new') ? cancelBody : deleteBody,
                    action: action,
-                    actionText: (action_label === 'cancel' || job.status === 'new') ? "YES" : "DELETE"
+                    actionText: (action_label === 'cancel' || job.status === 'new') ? "OK" : "DELETE"
                });
            });

--- a/awx/ui/client/src/inventories/add/inventory-add.controller.js
+++ b/awx/ui/client/src/inventories/add/inventory-add.controller.js
@@ -11,10 +11,16 @@
 */

 function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
-    $stateParams, GenerateForm, InventoryForm, Rest, Alert, ProcessErrors,
+    $stateParams, GenerateForm, InventoryForm, rbacUiControlService, Rest, Alert, ProcessErrors,
    ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
    $state) {

+    $scope.canAdd = false;
+    rbacUiControlService.canAdd(GetBasePath('inventory'))
+        .then(function(canAdd) {
+            $scope.canAdd = canAdd;
+        });
+
    Rest.setUrl(GetBasePath('inventory'));
    Rest.options()
        .success(function(data) {
@@ -91,7 +97,7 @@ function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
 }

 export default ['$scope', '$rootScope', '$compile', '$location',
-    '$log', '$stateParams', 'GenerateForm', 'InventoryForm', 'Rest', 'Alert',
+    '$log', '$stateParams', 'GenerateForm', 'InventoryForm', 'rbacUiControlService', 'Rest', 'Alert',
    'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange',
    'Wait', 'ToJSON', '$state', InventoriesAdd
 ];
--- a/awx/ui/client/src/inventories/edit/inventory-edit.controller.js
+++ b/awx/ui/client/src/inventories/edit/inventory-edit.controller.js
@@ -32,7 +32,7 @@ function InventoriesEdit($scope, $rootScope, $compile, $location,
        form.formFieldSize = null;
        $scope.inventory_id = inventory_id;

-        $scope.$watch('invnentory_obj.summary_fields.user_capabilities.edit', function(val) {
+        $scope.$watch('inventory_obj.summary_fields.user_capabilities.edit', function(val) {
            if (val === false) {
                $scope.canAdd = false;
            }
--- a/awx/ui/client/src/inventories/main.js
+++ b/awx/ui/client/src/inventories/main.js
@@ -66,7 +66,19 @@ angular.module('inventory', [
                        ],
                        ParentObject: ['groupData', function(groupData) {
                            return groupData;
-                        }]
+                        }],
+                        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: {
                        // clear form template when views render in this substate
--- a/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
@@ -123,7 +123,7 @@ export default ['$state', '$stateParams', '$scope', 'ToggleNotification', 'Parse
            $scope.source = source;
            if (source.value === 'ec2' || source.value === 'custom' ||
                source.value === 'vmware' || source.value === 'openstack') {
-                $scope[source.value + '_variables'] = $scope[source.value + '_variables'] === null ? '---' : $scope[source.value + '_variables'];
+                $scope[source.value + '_variables'] = $scope[source.value + '_variables'] === (null || undefined) ? '---' : $scope[source.value + '_variables'];
                ParseTypeChange({
                    scope: $scope,
                    field_id: source.value + '_variables',
--- a/awx/ui/client/src/lists/AllJobs.js
+++ b/awx/ui/client/src/lists/AllJobs.js
@@ -18,6 +18,7 @@ export default
        hover: true,
        well: false,
        emptyListText: i18n._('No jobs have yet run.'),
+        title: false,

        fields: {
            status: {
--- a/awx/ui/client/src/lists/Projects.js
+++ b/awx/ui/client/src/lists/Projects.js
@@ -42,14 +42,14 @@ export default
            scm_revision: {
                label: i18n._('Revision'),
                excludeModal: true,
-                columnClass: 'col-lg-3 col-md-2 col-sm-3 hidden-xs',
+                columnClass: 'col-lg-4 col-md-2 col-sm-3 hidden-xs',
                class: 'List-staticColumnAdjacent--monospace'
            },
            scm_type: {
                label: i18n._('Type'),
                ngBind: 'project.type_label',
                excludeModal: true,
-                columnClass: 'col-lg-3 col-md-2 col-sm-3 hidden-xs'
+                columnClass: 'col-lg-2 col-md-2 col-sm-3 hidden-xs'
            },
            last_updated: {
                label: i18n._('Last Updated'),
@@ -61,6 +61,14 @@ export default
        },

        actions: {
+            refresh: {
+                mode: 'all',
+                awToolTip: i18n._("Refresh the page"),
+                ngClick: "refresh()",
+                ngShow: "socketStatus === 'error'",
+                actionClass: 'btn List-buttonDefault',
+                buttonContent: i18n._('REFRESH')
+            },
            add: {
                mode: 'all', // One of: edit, select, all
                ngClick: 'addProject()',
@@ -68,14 +76,6 @@ export default
                actionClass: 'btn List-buttonSubmit',
                buttonContent: '&#43; ' + i18n._('ADD'),
                ngShow: "canAdd"
-            },
-            refresh: {
-                mode: 'all',
-                awToolTip: i18n._("Refresh the page"),
-                ngClick: "refresh()",
-                ngShow: "socketStatus == 'error'",
-                actionClass: 'btn List-buttonDefault',
-                buttonContent: i18n._('REFRESH')
            }
        },

--- a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
+++ b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
@@ -507,11 +507,15 @@
                <label class="Form-inputLabel RepeatFrequencyOptions-everyLabel"><span class="red-text">*</span> Select a time period after which to remove old facts</label>
                <div class="RepeatFrequencyOptions-inputGroup RepeatFrequencyOptions-inputGroup--halvesWithSelect">
                    <input type="number" id="keep_amount" name="keep_amount" ng-model="keep_amount" aw-spinner="keep_amount" ng-required="true" sch-spinner="scheduler_form" class="scheduler-time-spinner SchedulerTime-input SpinnerInput RepeatFrequencyOptions-number" aw-min=0 aw-max=9999 integer></input>
+                    <select id="keep_unit" name="keep_unit" ng-model="keep_unit" ng-options="type.label for type in keep_unit_choices track by type.value" ng-required="true" class="form-control input-sm MakeSelect2"></select>
+                </div>
+
+                <!-- The below errors are ONLY for id="keep_amount", not for id="keep_unit" -->
+                <div>
                    <div class="error" ng-show="scheduler_form.keep_amount.$dirty && scheduler_form.keep_amount.$error.required">Please enter the number of days you would like to keep this data.</div>
                    <div class="error survey_error" ng-show="scheduler_form.keep_amount.$error.number || scheduler_form.keep_amount.$error.integer" >Please enter a valid number.</div>
                    <div class="error survey_error" ng-show="scheduler_form.keep_amount.$error.awMin">Please enter a non-negative number.</div>
                    <div class="error survey_error" ng-show="scheduler_form.keep_amount.$error.awMax">Please enter a number smaller than 9999.</div>
-                    <select id="keep_unit" name="keep_unit" ng-model="keep_unit" ng-options="type.label for type in keep_unit_choices track by type.value" ng-required="true" class="form-control input-sm MakeSelect2"></select>
                </div>
            </div>

@@ -520,11 +524,15 @@
                <div class="RepeatFrequencyOptions-inputGroup RepeatFrequencyOptions-inputGroup--halvesWithSelect">
                    <input type="number" sch-spinner="scheduler_form" class="scheduler-time-spinner SchedulerTime-input SpinnerInput RepeatFrequencyOptions-number" id="granularity_keep_amount" name="granularity_keep_amount" ng-model="granularity_keep_amount" aw-spinner="granularity_keep_amount"
                    ng-required="true" aw-min=0 aw-max=9999 >
+                    <select id="granularity_keep_unit" name="granularity_keep_unit" ng-model="granularity_keep_unit" ng-options="type.label for type in granularity_keep_unit_choices track by type.value" ng-required="true" class="form-control input-sm MakeSelect2"></select>
+                </div>
+
+                <!-- The below errors are ONLY for id="granularity_keep_amount", not for id="granularity_keep_unit" -->
+                <div>
                    <div class="error" ng-show="scheduler_form.granularity_keep_amount.$dirty && scheduler_form.granularity_keep_amount.$error.required">Please enter the number of days you would like to keep this data.</div>
                    <div class="error survey_error" ng-show="scheduler_form.granularity_keep_amount.$error.number || scheduler_form.granularity_keep_amount.$error.integer" >Please enter a valid number.</div>
                    <div class="error survey_error" ng-show="scheduler_form.granularity_keep_amount.$error.awMin">Please enter a non-negative number.</div>
                    <div class="error survey_error" ng-show="scheduler_form.granularity_keep_amount.$error.awMax">Please enter a number smaller than 9999.</div>
-                    <select id="granularity_keep_unit" name="granularity_keep_unit" ng-model="granularity_keep_unit" ng-options="type.label for type in granularity_keep_unit_choices track by type.value" ng-required="true" class="form-control input-sm MakeSelect2"></select>
                </div>
            </div>
        <!-- end management job fields     -->
--- a/awx/ui/client/src/organizations/list/organizations-list.controller.js
+++ b/awx/ui/client/src/organizations/list/organizations-list.controller.js
@@ -127,6 +127,16 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
            });
        };

+        function isDeletedOrganizationBeingEdited(deleted_organization_id, editing_organization_id) {
+            if (editing_organization_id === undefined) {
+                return false;
+            }
+            if (deleted_organization_id === editing_organization_id) {
+                return true;
+            }
+            return false;
+        }
+
        $scope.deleteOrganization = function(id, name) {

            var action = function() {
@@ -137,7 +147,11 @@ export default ['$stateParams', '$scope', '$rootScope', '$location',
                Rest.destroy()
                    .success(function() {
                        Wait('stop');
-                        $state.reload('organizations');
+                        if (isDeletedOrganizationBeingEdited(id, parseInt($stateParams.organization_id)) === true) {
+                            $state.go('^', null, { reload: true });
+                        } else {
+                            $state.reload('organizations');
+                        }
                    })
                    .error(function(data, status) {
                        ProcessErrors($scope, data, status, null, {
--- a/awx/ui/client/src/partials/jobs.html
+++ b/awx/ui/client/src/partials/jobs.html
@@ -16,7 +16,7 @@
                    </button>
                </div>
            </div>
-            <div ui-view='list'></div>
+            <div ui-view="list"></div>
        </div>
    </div>
    <div ng-include="'/static/partials/logviewer.html'"></div>
--- a/awx/ui/client/src/shared/Utilities.js
+++ b/awx/ui/client/src/shared/Utilities.js
@@ -198,6 +198,8 @@ angular.module('Utilities', ['RestServices', 'Utilities', 'sanitizeFilter'])
                    msg += 'Please contact your system administrator.';
                }
                Alert(defaultMsg.hdr, msg);
+            } else if (status === 409) {
+                Alert('Conflict', data.conflict || "Resource currently in use.");
            } else if (status === 410) {
                Alert('Deleted Object', 'The requested object was previously deleted and can no longer be accessed.');
            } else if ((status === 'Token is expired') || (status === 401 && data.detail && data.detail === 'Token is expired') ||
--- a/awx/ui/client/src/shared/directives.js
+++ b/awx/ui/client/src/shared/directives.js
@@ -620,12 +620,10 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'JobsHelper'])

            if (attrs.tipWatch) {
                // Add dataTipWatch: 'variable_name'
-                scope.$watch(attrs.tipWatch, function(newVal, oldVal) {
-                    if (newVal !== oldVal) {
-                        // Where did fixTitle come from?:
-                        //   http://stackoverflow.com/questions/9501921/change-twitter-bootstrap-tooltip-content-on-click
-                        $(element).tooltip('hide').attr('data-original-title', newVal).tooltip('fixTitle');
-                    }
+                scope.$watch(attrs.tipWatch, function(newVal) {
+                    // Where did fixTitle come from?:
+                    //   http://stackoverflow.com/questions/9501921/change-twitter-bootstrap-tooltip-content-on-click
+                    $(element).tooltip('hide').attr('data-original-title', newVal).tooltip('fixTitle');
                });
            }
        }
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -134,7 +134,7 @@ export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
                    base, action, fld, cnt, field_action, fAction, itm;

                if (options.mode !== 'lookup') {
-                    if (options.title !== false) {
+                    if (options.title !== false && list.title !== false) {
                        html += "<div class=\"List-header\">";
                        html += "<div class=\"List-title\">";

@@ -311,7 +311,7 @@ export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
                }

                if (list.multiSelect) {
-                    innerTable += '<td class="col-xs-1 select-column List- List-staticColumn--smallStatus"><select-list-item item=\"' + list.iterator + '\"></select-list-item></td>';
+                    innerTable += '<td class="col-xs-1 select-column List-staticColumn--smallStatus"><select-list-item item=\"' + list.iterator + '\"></select-list-item></td>';
                }

                // Change layout if a lookup list, place radio buttons before labels
--- a/awx/ui/client/src/templates/list/templates-list.controller.js
+++ b/awx/ui/client/src/templates/list/templates-list.controller.js
@@ -131,7 +131,7 @@ export default ['$scope', '$rootScope', '$location', '$stateParams', 'Rest',
                                    handleSuccessfulDelete();
                                }, function (data) {
                                    Wait('stop');
-                                    ProcessErrors($scope, data, status, null, { hdr: 'Error!',
+                                    ProcessErrors($scope, data, data.status, null, { hdr: 'Error!',
                                        msg: 'Call to delete workflow job template failed. DELETE returned status: ' + status });
                                });
                            }
@@ -141,8 +141,8 @@ export default ['$scope', '$rootScope', '$location', '$stateParams', 'Rest',
                                    handleSuccessfulDelete();
                                }, function (data) {
                                    Wait('stop');
-                                    ProcessErrors($scope, data, status, null, { hdr: 'Error!',
-                                        msg: 'Call to delete job template failed. DELETE returned status: ' + status });
+                                    ProcessErrors($scope, data, data.status, null, { hdr: 'Error!',
+                                        msg: 'Call to delete job template failed. DELETE returned status: ' + data.status });
                                });
                            }
                            else {
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -81,7 +81,7 @@
                        <div id="alert-modal-msg" class="alert" ng-bind-html="alertBody"></div>
                    </div>
                    <div class="modal-footer">
-                        <a href="#" ng-hide="disableButtons" data-target="#form-modal" data-dismiss="modal" id="alert_ok_btn" class="btn btn-primary">{% trans 'OK' %}</a>
+                        <a href="#" ng-hide="disableButtons" data-target="#form-modal" data-dismiss="modal" id="alert_ok_btn" class="btn btn-default">{% trans 'OK' %}</a>
                    </div>
                </div>
                <!-- modal-content -->