ge-aerospace/shopdb-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Employees: external photo base URL is a setting
Some checks failed
CI / backend (push) Successful in 1m45s
Details
CI / naming (push) Successful in 2s
Details
CI / frontend (push) Successful in 8s
Details
CI / migrations-mysql (push) Failing after 8s
Details

Browse Source 
External HR Picture values are relative paths; the resolver hardcoded
/static/employees/ (which the SPA then mounts under the subpath, e.g.
/ops/static/...), but sites like WJ serve those photos from the
classic EmployeeDBAPP on another URL entirely. New setting
employee_photo_base_url (blank keeps the old behavior; a full URL like
https://host/EmployeeDBAPP/images/ passes through withBase untouched),
declared in the plugin config schema.
This commit is contained in:
cproudlock
2026-07-17 11:16:04 -04:00
parent 0cc205d25e
commit 5625608bd0
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/employees/api/routes.py
View File

@@ -43,9 +43,10 @@ EMPLOYEE_PHOTO_EXTENSIONS = {'.png', '.jpg', '.jpeg', '.gif', '.webp'}
# URL prefix a served upload resolves to (self-hosted mode). # URL prefix a served upload resolves to (self-hosted mode).
EMPLOYEE_PHOTO_URL_PREFIX = '/api/employees/photo/' EMPLOYEE_PHOTO_URL_PREFIX = '/api/employees/photo/'
# URL prefix external HR relative picture paths resolve under. The HR employees # Fallback URL prefix external HR relative picture paths resolve under when
# table stores Picture as a relative path (e.g. 'Support/210009518.png') that # the employee_photo_base_url setting is unset. Sites whose photos live on
# the site serves from /static/employees/; this matches the shopfloor feed. # another host (e.g. the classic EmployeeDBAPP) set the setting to a full URL
# such as https://host/EmployeeDBAPP/images/ instead.
EMPLOYEE_PHOTO_STATIC_PREFIX = '/static/employees/' EMPLOYEE_PHOTO_STATIC_PREFIX = '/static/employees/'
@@ -96,7 +97,10 @@ def _external_photo_url(picture):
return None return None
if text.startswith(('http://', 'https://', '/')): if text.startswith(('http://', 'https://', '/')):
return text return text
return EMPLOYEE_PHOTO_STATIC_PREFIX + text from shopdb.api import Setting
base = (Setting.get('employee_photo_base_url') or '').strip() \
or EMPLOYEE_PHOTO_STATIC_PREFIX
return base.rstrip('/') + '/' + text.lstrip('/')
def _hr_picture(sso): def _hr_picture(sso):

5
plugins/employees/plugin.py
View File

@@ -79,6 +79,11 @@ class EmployeesPlugin(BasePlugin):
"""Employee directory DB connection. Host/name/user are settings the """Employee directory DB connection. Host/name/user are settings the
wizard can edit; the password stays in .env (emitted, not stored).""" wizard can edit; the password stays in .env (emitted, not stored)."""
return [ return [
{'key': 'employee_photo_base_url', 'label': 'Photo base URL',
'type': 'text', 'secret': False,
'help': 'Where external HR relative Picture paths resolve, e.g. '
'https://host/EmployeeDBAPP/images/. Blank = this '
'site\'s /static/employees/.'},
{'key': 'employee_db_host', 'label': 'Employee DB host', 'type': 'text', {'key': 'employee_db_host', 'label': 'Employee DB host', 'type': 'text',
'secret': False, 'default': 'localhost', 'secret': False, 'default': 'localhost',
'help': 'This DB must expose an "employees" table or view with columns ' 'help': 'This DB must expose an "employees" table or view with columns '