External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-23 16:47:45 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4865 from mabashian/3607-settings

Browse Source 
Fix settings page rendering when some fields are set manually in file

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-10-02 19:43:18 +00:00
committed by GitHub
parent e6a5d18ebe 4aeda635ff
commit 3725ccb43b
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/configuration/settings.service.js
View File

@@ -34,6 +34,7 @@ export default ['GetBasePath', '$q', 'Rest', 'i18n',
}
delete optsFromAPI[key].child;
};
if (optsFromAPI.OAUTH2_PROVIDER) {
unnestOauth2ProviderKey('ACCESS_TOKEN_EXPIRE_SECONDS',
i18n._('The duration (in seconds) access tokens remain valid since their creation.'),
i18n._('Access Token Expiration'),
@@ -42,6 +43,7 @@ export default ['GetBasePath', '$q', 'Rest', 'i18n',
i18n._('The duration (in seconds) authorization codes remain valid since their creation.'),
i18n._('Authorization Code Expiration'),
'OAUTH2_PROVIDER');
}
return optsFromAPI;
};
var getActions = appendOauth2ProviderKeys(data.actions.GET);