diff --git a/messages/uniworx/categories/qualification/de-de-formal.msg b/messages/uniworx/categories/qualification/de-de-formal.msg index 6edfe9c1a..76f455107 100644 --- a/messages/uniworx/categories/qualification/de-de-formal.msg +++ b/messages/uniworx/categories/qualification/de-de-formal.msg @@ -81,7 +81,7 @@ QualificationActExpire: Auslaufend markieren - keine Benachrichtigung zur Erneue QualificationActUnexpire: Auslaufend aufheben - kostenpflichtige Benachrichtigung bei anstehender Erneuerung senden QualificationSetExpire n@Int64: Benachrichtigung bei anstehender Erneuerung und E‑Learning abgeschaltet für #{n} #{pluralDE n "Person" "Personen"} QualificationSetUnexpire n@Int64: Benachrichtigung bei anstehender Erneuerung und E‑Learning aktiviert für #{n} #{pluralDE n "Person" "Personen"} -QualificationActBlockSupervisor: Dauerhaft entziehen, mit sofortiger Wirkung +QualificationActBlockSupervisor: Dauerhaft entziehen und Ansprechpartner entfernen, mit sofortiger Wirkung QualificationActBlock: Entziehen QualificationActUnblock: Entzug löschen QualificationStatusBlock l@QualificationShorthand n@Int m@Int: #{n}/#{m} #{l} entzogen diff --git a/messages/uniworx/categories/qualification/en-eu.msg b/messages/uniworx/categories/qualification/en-eu.msg index 607189e1d..1d97d5640 100644 --- a/messages/uniworx/categories/qualification/en-eu.msg +++ b/messages/uniworx/categories/qualification/en-eu.msg @@ -81,7 +81,7 @@ QualificationActExpire: Discontinue - qualification expires silently QualificationActUnexpire: Continue - send a possibly fee-paying notification upon due renewal QualificationSetExpire n: Expiry notification and e‑learning deactivated for #{n} #{pluralENs n "person"} QualificationSetUnexpire n: Expiry notification and e‑learning activated for #{n} #{pluralENs n "person"} -QualificationActBlockSupervisor: Waive permanently, effective immediately +QualificationActBlockSupervisor: Waive permanently and remove all supervisiors, effective immediately QualificationActBlock: Revoke QualificationActUnblock: Clear revocation QualificationStatusBlock l n m: #{n}/#{m} #{l} revoked diff --git a/src/Handler/Qualification.hs b/src/Handler/Qualification.hs index f05f126b4..70658679c 100644 --- a/src/Handler/Qualification.hs +++ b/src/Handler/Qualification.hs @@ -491,8 +491,8 @@ postQualificationR sid qsh = do _ -> error "Handle.Qualification.isBlockAct returned non-block action" oks <- runDB $ do - -- deleteWhere [UserSupervisorUser <-. selUserIds] - -- deleteWhere [UserCompanyUser <-. selUserIds] + deleteWhere [UserSupervisorUser <-. selUserIds] + deleteWhere [UserCompanyUser <-. selUserIds] qualificationUserBlocking qid selUserIds qubr let nrq = length selectedUsers warnLevel = if