mirror of
https://github.com/inventree/InvenTree.git
synced 2026-04-07 03:50:52 +00:00
[bug] Fix custom logo and splash (#11391)
* Add custom logo and splash to playwright fixtures * Render custom logo in frontend * Add playwright tests for customization settings * Separate playwright run for customization * Update ci file * Update playwright config file * Do not call get_custom_file from withing settings.py - django app not fully initialized yet - can cause loops * Disable default tests (for now) * Re-enable normal tests * Update qc checks * Order of operations? * Debug output * Use env * Add more debug info * More debug * Further debug * Add collectstatic check * Run normal tests too * Remove debug prints
This commit is contained in:
3
src/backend/InvenTree/.gitignore
vendored
3
src/backend/InvenTree/.gitignore
vendored
@@ -1,2 +1,5 @@
|
||||
# Files generated during unit testing
|
||||
_testfolder/
|
||||
|
||||
# Playwright files for CI
|
||||
InvenTree/static/img/playwright*.png
|
||||
|
||||
@@ -250,7 +250,6 @@ def getBlankThumbnail():
|
||||
|
||||
def getLogoImage(as_file=False, custom=True):
|
||||
"""Return the InvenTree logo image, or a custom logo if available."""
|
||||
"""Return the path to the logo-file."""
|
||||
if custom and settings.CUSTOM_LOGO:
|
||||
static_storage = StaticFilesStorage()
|
||||
|
||||
|
||||
@@ -26,12 +26,7 @@ from corsheaders.defaults import default_headers as default_cors_headers
|
||||
|
||||
import InvenTree.backup
|
||||
from InvenTree.cache import get_cache_config, is_global_cache_enabled
|
||||
from InvenTree.config import (
|
||||
get_boolean_setting,
|
||||
get_custom_file,
|
||||
get_oidc_private_key,
|
||||
get_setting,
|
||||
)
|
||||
from InvenTree.config import get_boolean_setting, get_oidc_private_key, get_setting
|
||||
from InvenTree.ready import isInMainThread
|
||||
from InvenTree.sentry import default_sentry_dsn, init_sentry
|
||||
from InvenTree.version import checkMinPythonVersion, inventreeCommitHash
|
||||
@@ -1453,12 +1448,9 @@ if len(GLOBAL_SETTINGS_OVERRIDES) > 0:
|
||||
logger.debug('- Override value for %s = ********', key)
|
||||
|
||||
# User interface customization values
|
||||
CUSTOM_LOGO = get_custom_file(
|
||||
'INVENTREE_CUSTOM_LOGO', 'customize.logo', 'custom logo', lookup_media=True
|
||||
)
|
||||
CUSTOM_SPLASH = get_custom_file(
|
||||
'INVENTREE_CUSTOM_SPLASH', 'customize.splash', 'custom splash'
|
||||
)
|
||||
CUSTOM_LOGO = get_setting('INVENTREE_CUSTOM_LOGO', 'customize.logo', typecast=str)
|
||||
|
||||
CUSTOM_SPLASH = get_setting('INVENTREE_CUSTOM_SPLASH', 'customize.splash', typecast=str)
|
||||
|
||||
CUSTOMIZE = get_setting(
|
||||
'INVENTREE_CUSTOMIZE', 'customize', default_value=None, typecast=dict
|
||||
|
||||
Reference in New Issue
Block a user