From 0be7c6c9f5679b45eab93d817f34e8cc83458f04 Mon Sep 17 00:00:00 2001
From: germanocaumo <germanocaumo@gmail.com>
Date: Mon, 7 Jun 2021 19:21:21 +0000
Subject: [PATCH] fix(poll): fix client crash with A-F as options and
quick-poll type
---
.../components/actions-bar/quick-poll-dropdown/component.jsx | 1 -
bigbluebutton-html5/imports/ui/components/poll/service.js | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/quick-poll-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/quick-poll-dropdown/component.jsx
index 0142800776..76f1e7c5a3 100644
--- a/bigbluebutton-html5/imports/ui/components/actions-bar/quick-poll-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/quick-poll-dropdown/component.jsx
@@ -80,7 +80,6 @@ const getAvailableQuickPolls = (slideId, parsedSlides, startPoll, intl, pollType
itemLabel = options.join('/').replace(/[\n.)]/g, '');
} else {
answers = getLocalizedAnswers(type, intl, pollTypes);
- type = pollTypes.Custom;
}
// removes any whitespace from the label
diff --git a/bigbluebutton-html5/imports/ui/components/poll/service.js b/bigbluebutton-html5/imports/ui/components/poll/service.js
index 8b61817579..b161193ff0 100644
--- a/bigbluebutton-html5/imports/ui/components/poll/service.js
+++ b/bigbluebutton-html5/imports/ui/components/poll/service.js
@@ -95,7 +95,9 @@ const getPollResultsText = (isDefaultPoll, answers, numRespondents, intl) => {
const pctBars = "|".repeat(pct * MAX_POLL_RESULT_BARS / 100);
const pctFotmatted = `${Number.isNaN(pct) ? 0 : pct}%`;
if (isDefaultPoll) {
- const translatedKey = intl.formatMessage(pollAnswerIds[item.key.toLowerCase()]);
+ const translatedKey = pollAnswerIds[item.key.toLowerCase()]
+ ? intl.formatMessage(pollAnswerIds[item.key.toLowerCase()])
+ : item.key;
resultString += `${translatedKey}: ${item.numVotes || 0} |${pctBars} ${pctFotmatted}\n`;
} else {
resultString += `${item.id+1}: ${item.numVotes || 0} |${pctBars} ${pctFotmatted}\n`;
--
GitLab