From 8a5cd3ec7dac58423684a00f89e1ed8e8d68b73f Mon Sep 17 00:00:00 2001 From: Taras Burko Date: Tue, 6 Mar 2018 14:03:36 +0200 Subject: [PATCH] Fix "System settings panel form is not rendering #1440" --- awx/settings/defaults.py | 9 --------- .../system-form/sub-forms/system-misc.form.js | 8 ++++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 709c3a20dd..2f0bd0ca6a 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -368,15 +368,6 @@ TACACSPLUS_SECRET = '' TACACSPLUS_SESSION_TIMEOUT = 5 TACACSPLUS_AUTH_PROTOCOL = 'ascii' -# Seconds before auth tokens expire. -# Note: This setting may be overridden by database settings. -AUTH_TOKEN_EXPIRATION = 1800 - -# Maximum number of per-user valid, concurrent tokens. -# -1 is unlimited -# Note: This setting may be overridden by database settings. -AUTH_TOKEN_PER_USER = -1 - # Enable / Disable HTTP Basic Authentication used in the API browser # Note: Session limits are not enforced when using HTTP Basic Authentication. # Note: This setting may be overridden by database settings. diff --git 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 index 04ca0d03d5..1e185a5f1a 100644 --- 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 @@ -21,18 +21,18 @@ export default ['i18n', function(i18n) { ORG_ADMINS_CAN_SEE_ALL_USERS: { type: 'toggleSwitch', }, - AUTH_TOKEN_EXPIRATION: { + SESSION_COOKIE_AGE: { type: 'number', integer: true, min: 60, - reset: 'AUTH_TOKEN_EXPIRATION', + reset: 'SESSION_COOKIE_AGE', }, - AUTH_TOKEN_PER_USER: { + SESSIONS_PER_USER: { type: 'number', integer: true, spinner: true, min: -1, - reset: 'AUTH_TOKEN_PER_USER', + reset: 'SESSIONS_PER_USER', }, AUTH_BASIC_ENABLED: { type: 'toggleSwitch',