inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-17 04:25:42 +00:00
Code Activity

change settings order

Browse Source
This commit is contained in:
Matthias Mair
2025-01-19 23:57:25 +01:00
parent 47ece105e5
commit 67d89b549f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/InvenTree/InvenTree/settings.py
View File

@ -1224,6 +1224,10 @@ else:
if CORS_ALLOWED_ORIGIN_REGEXES: if CORS_ALLOWED_ORIGIN_REGEXES:
logger.info('CORS: Whitelisted origin regexes: %s', CORS_ALLOWED_ORIGIN_REGEXES) logger.info('CORS: Whitelisted origin regexes: %s', CORS_ALLOWED_ORIGIN_REGEXES)
# Load settings for the frontend interface
FRONTEND_SETTINGS = config.get_frontend_settings(debug=DEBUG)
FRONTEND_URL_BASE = FRONTEND_SETTINGS['base_url']
# region auth # region auth
for app in SOCIAL_BACKENDS: for app in SOCIAL_BACKENDS:
# Ensure that the app starts with 'allauth.socialaccount.providers' # Ensure that the app starts with 'allauth.socialaccount.providers'
@ -1302,7 +1306,9 @@ ACCOUNT_LOGOUT_ON_PASSWORD_CHANGE = True
HEADLESS_FRONTEND_URLS = { HEADLESS_FRONTEND_URLS = {
'account_confirm_email': 'http://localhost:8000/verify-email/{key}', # noqa: RUF027 'account_confirm_email': 'http://localhost:8000/verify-email/{key}', # noqa: RUF027
'account_reset_password': 'http://localhost:8000/password-reset', 'account_reset_password': 'http://localhost:8000/password-reset',
'account_reset_password_from_key': 'http://localhost:8000/password-reset-key/{key}', # noqa: RUF027 'account_reset_password_from_key': 'http://localhost:8000/'
+ FRONTEND_URL_BASE
+ '/set-password?key={key}', # noqa: RUF027
'account_signup': 'http://localhost:8000/signup', 'account_signup': 'http://localhost:8000/signup',
'socialaccount_login_error': 'http://localhost:8000/social-login-error', 'socialaccount_login_error': 'http://localhost:8000/social-login-error',
} }
@ -1388,10 +1394,6 @@ CUSTOMIZE = get_setting(
'INVENTREE_CUSTOMIZE', 'customize', default_value=None, typecast=dict 'INVENTREE_CUSTOMIZE', 'customize', default_value=None, typecast=dict
) )
# Load settings for the frontend interface
FRONTEND_SETTINGS = config.get_frontend_settings(debug=DEBUG)
FRONTEND_URL_BASE = FRONTEND_SETTINGS['base_url']
if DEBUG: if DEBUG:
logger.info('InvenTree running with DEBUG enabled') logger.info('InvenTree running with DEBUG enabled')