External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-02 01:08:48 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix "System settings panel form is not rendering #1440"

Browse Source
This commit is contained in:
Taras Burko
2018-03-06 14:03:36 +02:00
parent d6af0bfd50
commit 8a5cd3ec7d
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/settings/defaults.py
View File

@@ -368,15 +368,6 @@ TACACSPLUS_SECRET = ''
TACACSPLUS_SESSION_TIMEOUT = 5 TACACSPLUS_SESSION_TIMEOUT = 5
TACACSPLUS_AUTH_PROTOCOL = 'ascii' 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 # Enable / Disable HTTP Basic Authentication used in the API browser
# Note: Session limits are not enforced when using HTTP Basic Authentication. # Note: Session limits are not enforced when using HTTP Basic Authentication.
# Note: This setting may be overridden by database settings. # Note: This setting may be overridden by database settings.

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

@@ -21,18 +21,18 @@ export default ['i18n', function(i18n) {
ORG_ADMINS_CAN_SEE_ALL_USERS: { ORG_ADMINS_CAN_SEE_ALL_USERS: {
type: 'toggleSwitch', type: 'toggleSwitch',
}, },
AUTH_TOKEN_EXPIRATION: { SESSION_COOKIE_AGE: {
type: 'number', type: 'number',
integer: true, integer: true,
min: 60, min: 60,
reset: 'AUTH_TOKEN_EXPIRATION', reset: 'SESSION_COOKIE_AGE',
}, },
AUTH_TOKEN_PER_USER: { SESSIONS_PER_USER: {
type: 'number', type: 'number',
integer: true, integer: true,
spinner: true, spinner: true,
min: -1, min: -1,
reset: 'AUTH_TOKEN_PER_USER', reset: 'SESSIONS_PER_USER',
}, },
AUTH_BASIC_ENABLED: { AUTH_BASIC_ENABLED: {
type: 'toggleSwitch', type: 'toggleSwitch',