diff --git a/src/backend/InvenTree/InvenTree/config.py b/src/backend/InvenTree/InvenTree/config.py index 5c62fc66c6..525da2da8f 100644 --- a/src/backend/InvenTree/InvenTree/config.py +++ b/src/backend/InvenTree/InvenTree/config.py @@ -419,20 +419,9 @@ def get_frontend_settings(debug=True): # Set the base URL if 'base_url' not in settings: - base_url = get_setting('INVENTREE_PUI_URL_BASE', 'pui_url_base', '') - - if base_url: - warnings.warn( - "The 'INVENTREE_PUI_URL_BASE' key is deprecated. Please use 'INVENTREE_FRONTEND_URL_BASE' instead", - DeprecationWarning, - stacklevel=2, - ) - else: - base_url = get_setting( - 'INVENTREE_FRONTEND_URL_BASE', 'frontend_url_base', 'platform' - ) - - settings['base_url'] = base_url + settings['base_url'] = get_setting( + 'INVENTREE_FRONTEND_URL_BASE', 'frontend_url_base', 'platform' + ) # Set the server list settings['server_list'] = settings.get('server_list', []) diff --git a/src/backend/InvenTree/InvenTree/settings.py b/src/backend/InvenTree/InvenTree/settings.py index e86f087a42..202d78541b 100644 --- a/src/backend/InvenTree/InvenTree/settings.py +++ b/src/backend/InvenTree/InvenTree/settings.py @@ -1387,7 +1387,7 @@ CUSTOMIZE = get_setting( # Load settings for the frontend interface FRONTEND_SETTINGS = config.get_frontend_settings(debug=DEBUG) -FRONTEND_URL_BASE = FRONTEND_SETTINGS.get('base_url', 'platform') +FRONTEND_URL_BASE = FRONTEND_SETTINGS['base_url'] if DEBUG: logger.info('InvenTree running with DEBUG enabled') diff --git a/src/backend/InvenTree/config_template.yaml b/src/backend/InvenTree/config_template.yaml index 65c13d569c..4bca100d31 100644 --- a/src/backend/InvenTree/config_template.yaml +++ b/src/backend/InvenTree/config_template.yaml @@ -211,10 +211,3 @@ ldap: # hide_password_reset: true # logo: img/custom_logo.png # splash: img/custom_splash.jpg -# hide_pui_banner: true - -# Set enabled frontends -# Use the environment variable INVENTREE_CLASSIC_FRONTEND -# classic_frontend: True -# Use the environment variable INVENTREE_PLATFORM_FRONTEND -# platform_frontend: True