UI: Blender-id web-assets v2 upgrade #93590

Merged
Márton Lente merged 28 commits from ui/web-assets-v2-upgrade into main 2024-08-22 14:41:33 +02:00
2 changed files with 15 additions and 0 deletions
Showing only changes of commit f72660983b - Show all commits

View File

@ -4,6 +4,8 @@
Active Sessions Active Sessions
{% endblock %} {% endblock %}
{% block column_class %}col{% endblock column_class %}
{% block body %} {% block body %}
<div class="bid box"> <div class="bid box">
<h2>Active Sessions</h2> <h2>Active Sessions</h2>

View File

@ -318,6 +318,11 @@ LOGGING = {
"formatter": "default", # Set to 'verbose' in production "formatter": "default", # Set to 'verbose' in production
"stream": "ext://sys.stderr", "stream": "ext://sys.stderr",
}, },
'mail_admins': {
'level': 'ERROR',
'class': 'django.utils.log.AdminEmailHandler',
'include_html': True,
},
}, },
"loggers": { "loggers": {
"bid_main": {"level": "DEBUG"}, "bid_main": {"level": "DEBUG"},
@ -329,6 +334,7 @@ LOGGING = {
"level": "WARNING", "level": "WARNING",
"handlers": [ "handlers": [
"console", "console",
"mail_admins",
], ],
}, },
} }
@ -381,3 +387,10 @@ if os.environ.get('EMAIL_HOST_USER') is not None:
EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER') EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER')
if os.environ.get('EMAIL_HOST_PASSWORD') is not None: if os.environ.get('EMAIL_HOST_PASSWORD') is not None:
EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD') EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD')
if os.environ.get('ADMINS') is not None:
# Expects the following format:
# ADMINS='J Doe: jane@example.com, John Dee: john@example.com'
ADMINS = [[_.strip() for _ in adm.split(':')] for adm in os.environ.get('ADMINS').split(',')]
MAIL_SUBJECT_PREFIX = '[Blender ID]'
SERVER_EMAIL = f'django@{ALLOWED_HOSTS[0]}'