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

Merge pull request #6182 from marshmalien/CTiTUserSessionConfigs

Browse Source 
Expose CTiT user-session configurations
This commit is contained in:
Marliana Lara 2017-05-04 13:08:46 -04:00 committed by GitHub
commit 6c7028f657
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/legacy-styles/forms.less
View File

@ -199,6 +199,15 @@
margin-top: 10px;
}
.Form-formGroup {
input.form-control {
background-color: @default-secondary-bg;
border-color: @b7grey;
border-radius: 5px;
height: 30px;
}
}
.Form-checkbox--stacked {
label {
display: block;

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

@ -6,8 +6,8 @@
export default ['i18n', function(i18n) {
return {
showHeader: false,
name: 'configuration_misc_template',
showHeader: false,
showActions: true,
fields: {
@ -20,6 +20,22 @@ export default ['i18n', function(i18n) {
},
ORG_ADMINS_CAN_SEE_ALL_USERS: {
type: 'toggleSwitch',
},
AUTH_TOKEN_EXPIRATION: {
type: 'number',
integer: true,
min: 60,
reset: 'AUTH_TOKEN_EXPIRATION',
},
AUTH_TOKEN_PER_USER: {
type: 'number',
integer: true,
spinner: true,
min: -1,
reset: 'AUTH_TOKEN_PER_USER',
},
AUTH_BASIC_ENABLED: {
type: 'toggleSwitch',
}
},