Füge Sichtbarkeitsoptionen für Mitglieder und registrierte Benutzer hinzu; aktualisiere die Sichtbarkeitseinstellungen basierend auf Benutzerpräferenzen in der Mitgliederabfrage und dem Sichtbarkeits-Skript.
Some checks failed
Code Analysis (JS/Vue) / analyze (push) Failing after 50s
Some checks failed
Code Analysis (JS/Vue) / analyze (push) Failing after 50s
This commit is contained in:
@@ -131,11 +131,22 @@ export default defineEventHandler(async (event) => {
|
||||
lastLogin: user.lastLogin,
|
||||
isMannschaftsspieler: user.isMannschaftsspieler === true || mergedMembers[matchedManualIndex].isMannschaftsspieler === true
|
||||
}
|
||||
// If the registered user has visibility preferences, apply them (coerce to booleans)
|
||||
if (user.visibility && typeof user.visibility === 'object') {
|
||||
const vis = mergedMembers[matchedManualIndex].visibility || {}
|
||||
mergedMembers[matchedManualIndex].visibility = {
|
||||
showEmail: user.visibility.showEmail === undefined ? Boolean(vis.showEmail) : Boolean(user.visibility.showEmail),
|
||||
showPhone: user.visibility.showPhone === undefined ? Boolean(vis.showPhone) : Boolean(user.visibility.showPhone),
|
||||
showAddress: user.visibility.showAddress === undefined ? Boolean(vis.showAddress) : Boolean(user.visibility.showAddress)
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Add as new member (from login system)
|
||||
const migratedUser = migrateUserRoles({ ...user })
|
||||
const roles = Array.isArray(migratedUser.roles) ? migratedUser.roles : (migratedUser.role ? [migratedUser.role] : ['mitglied'])
|
||||
// Registered-only user: default to privacy-preserving visibility (hidden) unless user explicitly set visibility elsewhere
|
||||
// Use stored visibility from user if present, otherwise default to false
|
||||
const userVis = user.visibility || {}
|
||||
mergedMembers.push({
|
||||
id: user.id,
|
||||
name: user.name,
|
||||
@@ -143,9 +154,9 @@ export default defineEventHandler(async (event) => {
|
||||
phone: user.phone || '',
|
||||
address: '',
|
||||
visibility: {
|
||||
showEmail: false,
|
||||
showPhone: false,
|
||||
showAddress: false
|
||||
showEmail: userVis.showEmail === undefined ? false : Boolean(userVis.showEmail),
|
||||
showPhone: userVis.showPhone === undefined ? false : Boolean(userVis.showPhone),
|
||||
showAddress: userVis.showAddress === undefined ? false : Boolean(userVis.showAddress)
|
||||
},
|
||||
notes: `Rolle(n): ${roles.join(', ')}`,
|
||||
source: 'login',
|
||||
|
||||
Reference in New Issue
Block a user