Lars/shinkan-jinkendo
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

DGSVO Compliance update 1 #30

Merged
Lars merged 48 commits from develop into main 2026-05-12 06:34:15 +02:00
Conversation 0 Commits 48 Files Changed 73 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fff30b49e1 - Show all commits

4
backend/routers/media_assets.py
View File

@ -1671,7 +1671,7 @@ def get_legacy_rights_assets(
f""" f"""
SELECT ma.id, ma.original_filename, ma.visibility, ma.rights_status, SELECT ma.id, ma.original_filename, ma.visibility, ma.rights_status,
ma.created_at, ma.uploaded_by_profile_id, ma.created_at, ma.uploaded_by_profile_id,
p.username AS uploader_username p.name AS uploader_name
FROM media_assets ma FROM media_assets ma
LEFT JOIN profiles p ON p.id = ma.uploaded_by_profile_id LEFT JOIN profiles p ON p.id = ma.uploaded_by_profile_id
WHERE {where} WHERE {where}
@ -1733,7 +1733,7 @@ def get_media_asset_journal(
d.contains_third_party_content, d.third_party_rights_confirmed, d.contains_third_party_content, d.third_party_rights_confirmed,
d.third_party_rights_context, d.third_party_rights_context,
d.declared_by_profile_id, d.declared_by_profile_id,
p.username AS declared_by_username, p.name AS declared_by_name,
p.email AS declared_by_email p.email AS declared_by_email
FROM media_asset_rights_declarations d FROM media_asset_rights_declarations d
LEFT JOIN profiles p ON p.id = d.declared_by_profile_id LEFT JOIN profiles p ON p.id = d.declared_by_profile_id

2
frontend/src/pages/MediaLibraryPage.jsx
View File

@ -1419,7 +1419,7 @@ export default function MediaLibraryPage() {
) : ( ) : (
<div className="media-library__journal-list"> <div className="media-library__journal-list">
{journalModal.declarations.map((d) => { {journalModal.declarations.map((d) => {
const byLabel = d.declared_by_username || d.declared_by_email const byLabel = d.declared_by_name || d.declared_by_email
|| (d.declared_by_profile_id ? `Profil #${d.declared_by_profile_id}` : '—') || (d.declared_by_profile_id ? `Profil #${d.declared_by_profile_id}` : '—')
return ( return (
<div key={d.id} className="media-library__journal-entry"> <div key={d.id} className="media-library__journal-entry">