diff --git a/messages/uniworx/misc/de-de-formal.msg b/messages/uniworx/misc/de-de-formal.msg index 839285010..7fa240fe6 100644 --- a/messages/uniworx/misc/de-de-formal.msg +++ b/messages/uniworx/misc/de-de-formal.msg @@ -16,6 +16,7 @@ LdapIdentificationOrEmail: Fraport AG-Kennung / E-Mail-Adresse Months num@Int64: #{num} #{pluralDE num "Monat" "Monate"} Days num@Int64: #{num} #{pluralDE num "Tag" "Tage"} NoAutomaticUpdateTip: Dieser Wert wurde manuell editiert und wird daher nicht mehr automatisch durch as AVS aktualisiert. +AddressIsLinkedTip: Verlinkte Postaddresse: Für diesen Benutzer ist keine individuelle Postadresse gespeichert, die Adresse wurde stattdessen aus der Firmenzugehörigkeit abgeleitet. ClusterVolatileQuickActionsEnabled: Schnellzugriffsmenü aktiv diff --git a/messages/uniworx/misc/en-eu.msg b/messages/uniworx/misc/en-eu.msg index d8d4a25b2..e7142f4bc 100644 --- a/messages/uniworx/misc/en-eu.msg +++ b/messages/uniworx/misc/en-eu.msg @@ -16,6 +16,7 @@ LdapIdentificationOrEmail: Fraport AG-Kennung / email address Months num: #{num} #{pluralEN num "Month" "Months"} Days num: #{num} #{pluralEN num "Day" "Days"} NoAutomaticUpdateTip: This particular value receives no automatic AVS updates, since it has been edited manually. +AddressIsLinkedTip: Linked postal address: No individual postal address is stored for this user, instead a postal address was inferred from the user's company association. ClusterVolatileQuickActionsEnabled: Quick actions enabled diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs index c7ca9edd8..3f7472f78 100644 --- a/src/Handler/Profile.hs +++ b/src/Handler/Profile.hs @@ -626,7 +626,7 @@ makeProfileData usrEnt@(Entity uid usrVal@User{..}) = do avsId <- entityVal <<$>> getBy (UniqueUserAvsUser uid) let usrAutomatic :: CU_UserAvs_User -> Widget usrAutomatic = updateAutomatic . mayUpdate usrVal avsId . mkCheckUpdate - + addressLinkdIcon <- messageTooltip <$> messageIconI Info IconLink MsgAddressIsLinkedTip (actualPrefersPostal, (actualPostAddress, postalAutomatic), (actualDisplayEmail, emailAutomatic)) <- getPostalPreferenceAndAddress' usrEnt functions <- Map.fromListWith Set.union . map (\(Entity _ UserFunction{..}) -> (userFunctionFunction, Set.singleton userFunctionSchool)) <$> selectList [UserFunctionUser ==. uid] [] lecture_corrector <- E.select $ E.distinct $ E.from $ \(sheet `E.InnerJoin` corrector `E.InnerJoin` course) -> do diff --git a/templates/profileData.hamlet b/templates/profileData.hamlet index bbd5f6202..afdde798d 100644 --- a/templates/profileData.hamlet +++ b/templates/profileData.hamlet @@ -68,6 +68,8 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later
_{MsgAdminUserPostAddress} # ^{updateAutomatic postalAutomatic} + $if isNothing userPostAddress + ^{addressLinkdIcon}
#{addr} $if (not postalAutomatic) @@ -80,11 +82,11 @@ $# SPDX-License-Identifier: AGPL-3.0-or-later _{MsgUserDisplayEmail} # ^{updateAutomatic emailAutomatic}
- $maybe primaryEmail <- actualDisplayEmail - #{mailtoHtml primaryEmail} + $maybe primaryEmail <- actualDisplayEmail + #{mailtoHtml primaryEmail} $nothing ^{messageTooltip tooltipInvalidEmail} # - #{mailtoHtml userDisplayEmail} + #{mailtoHtml userDisplayEmail} $if Just userEmail /= actualDisplayEmail
_{MsgUserSystemEmail}