From 595f46d860f3f893cdeb6618e361d533b5c90b5c Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 23 Jan 2020 20:56:25 +0100 Subject: [PATCH] fix(exam-correct): correctly htmlify user on failure --- frontend/src/utils/exam-correct/exam-correct.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js index 4306f6db1..c0f0c84f0 100644 --- a/frontend/src/utils/exam-correct/exam-correct.js +++ b/frontend/src/utils/exam-correct/exam-correct.js @@ -513,10 +513,12 @@ function removeAllChildren(element) { } function userToHTML(user) { - if (user && user['display-name'] && user['surname']) { - return user['display-name'].replace(new RegExp(user['surname']), `${user['surname']}`) + (user['mat-nr'] ? ` (${user['mat-nr']})` : ''); - } else if (user && user.name) { - return user.name; + if (user) { + if (user['display-name'] && user['surname']) { + return user['display-name'].replace(new RegExp(user['surname']), `${user['surname']}`) + (user['mat-nr'] ? ` (${user['mat-nr']})` : ''); + } else { + return user; + } } else { console.error('Unable to format invalid user response'); return '';