remove auth misc form and move fields under system misc form

awx/ui/client/src/configuration/forms/auth-form/configuration-auth.controller.js

@@ -94,8 +94,7 @@ export default [
             {label: i18n._('LDAP'), value: 'ldap'},
             {label: i18n._('RADIUS'), value: 'radius'},
             {label: i18n._('SAML'), value: 'saml'},
-            {label: i18n._('TACACS+'), value: 'tacacs'},
+            {label: i18n._('TACACS+'), value: 'tacacs'}
-            {label: i18n._('MISC'), value: 'authMisc'}
         ];
 
         authVm.ldapDropdownOptions = [
@@ -198,12 +197,7 @@ export default [
                 formDef: formDefs.ldap5,
                 id: 'auth-ldap5-form',
                 name: 'ldap5'
-            },
+            }
-            {
-                formDef: formDefs.authMisc,
-                id: 'auth-misc-form',
-                name: 'authMisc'
-            },
         ];
         var forms = _.map(authForms, 'formDef');
         _.each(forms, function(form) {

awx/ui/client/src/configuration/forms/auth-form/configuration-auth.partial.html

@@ -97,10 +97,6 @@
             <div ng-show="authVm.activeAuthForm === 'saml'">
                 <div id="auth-saml-form"></div>
             </div>
-
-            <div ng-show="authVm.activeAuthForm === 'authMisc'">
-                <div id="auth-misc-form"></div>
-            </div>
         </div>
     </div>
 </div>

awx/ui/client/src/configuration/forms/auth-form/sub-forms/auth-misc.form.js

@@ -1,40 +0,0 @@
-/*************************************************
- * Copyright (c) 2016 Ansible, Inc.
- *
- * All Rights Reserved
- *************************************************/
-
-export default ['i18n', function(i18n) {
-  return {
-      name: 'configuration_authMisc_template',
-      showActions: true,
-      showHeader: false,
-
-      fields: {
-          ACCESS_TOKEN_EXPIRE_SECONDS: {
-              type: 'text',
-              reset: 'ACCESS_TOKEN_EXPIRE_SECONDS'
-          },
-          AUTHORIZATION_CODE_EXPIRE_SECONDS: {
-              type: 'text',
-              reset: 'AUTHORIZATION_CODE_EXPIRE_SECONDS'
-          }
-      },
-      buttons: {
-          reset: {
-              ngShow: '!user_is_system_auditor',
-              ngClick: 'vm.resetAllConfirm()',
-              label: i18n._('Revert all to default'),
-              class: 'Form-resetAll'
-          },
-          cancel: {
-              ngClick: 'vm.formCancel()',
-          },
-          save: {
-              ngClick: 'vm.formSave()',
-              ngDisabled: "!enterprise_auth || configuration_authMisc_template_form.$invalid || configuration_authMisc_template_form.$pending"
-          }
-      }
-  };
-}
-];

awx/ui/client/src/configuration/forms/settings-form.controller.js

@@ -19,7 +19,6 @@ export default [
     'configurationRadiusForm',
     'configurationTacacsForm',
     'configurationSamlForm',
-    'configurationMiscForm',
     'systemActivityStreamForm',
     'systemLoggingForm',
     'systemMiscForm',
@@ -45,7 +44,6 @@ export default [
         configurationRadiusForm,
         configurationTacacsForm,
         configurationSamlForm,
-        configurationMiscForm,
         systemActivityStreamForm,
         systemLoggingForm,
         systemMiscForm,
@@ -73,7 +71,6 @@ export default [
             'radius': configurationRadiusForm,
             'tacacs': configurationTacacsForm,
             'saml': configurationSamlForm,
-            'authMisc': configurationMiscForm,
             'activity_stream': systemActivityStreamForm,
             'logging': systemLoggingForm,
             'misc': systemMiscForm,

awx/ui/client/src/configuration/forms/system-form/sub-forms/system-misc.form.js

@@ -43,6 +43,14 @@ export default ['i18n', function(i18n) {
             ALLOW_OAUTH2_FOR_EXTERNAL_USERS: {
                 type: 'toggleSwitch',
             },
+            ACCESS_TOKEN_EXPIRE_SECONDS: {
+                type: 'text',
+                reset: 'ACCESS_TOKEN_EXPIRE_SECONDS'
+            },
+            AUTHORIZATION_CODE_EXPIRE_SECONDS: {
+                type: 'text',
+                reset: 'AUTHORIZATION_CODE_EXPIRE_SECONDS'
+            },
             REMOTE_HOST_HEADERS: {
                 type: 'textarea',
                 reset: 'REMOTE_HOST_HEADERS'

awx/ui/client/src/configuration/main.js

@@ -23,7 +23,6 @@ import configurationLdap5Form from './forms/auth-form/sub-forms/auth-ldap5.form.
 import configurationRadiusForm from './forms/auth-form/sub-forms/auth-radius.form.js';
 import configurationTacacsForm from './forms/auth-form/sub-forms/auth-tacacs.form.js';
 import configurationSamlForm from './forms/auth-form/sub-forms/auth-saml.form';
-import configurationMiscForm from './forms/auth-form/sub-forms/auth-misc.form';
 
 //system sub-forms
 import systemActivityStreamForm from './forms/system-form/sub-forms/system-activity-stream.form.js';
@@ -57,7 +56,6 @@ angular.module('configuration', [])
     .factory('configurationRadiusForm', configurationRadiusForm)
     .factory('configurationTacacsForm', configurationTacacsForm)
     .factory('configurationSamlForm', configurationSamlForm)
-    .factory('configurationMiscForm', configurationMiscForm)
     //system forms
     .factory('systemActivityStreamForm', systemActivityStreamForm)
     .factory('systemLoggingForm', systemLoggingForm)