From 40de5352248df3e17c7d790f5a0c89a2162cca46 Mon Sep 17 00:00:00 2001
From: Bianca Nenciu <nbianca@users.noreply.github.com>
Date: Tue, 7 Jul 2020 03:16:21 +0300
Subject: [PATCH] FIX: Set default value for poll result field (#10044)

---
 .../assets/javascripts/controllers/poll-ui-builder.js.es6    | 1 +
 .../test/javascripts/controllers/poll-ui-builder-test.js.es6 | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
index 0eca3fa8518..0dc7325150f 100644
--- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6
@@ -350,6 +350,7 @@ export default Controller.extend({
       pollStep: 1,
       autoClose: false,
       chartType: BAR_CHART_TYPE,
+      pollResult: this.alwaysPollResult,
       pollGroups: null,
       date: moment()
         .add(1, "day")
diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
index e8ec02908c2..3eee6bb070f 100644
--- a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
+++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6
@@ -320,6 +320,11 @@ test("staff_only option is not present for non-staff", function(assert) {
   );
 });
 
+test("poll result is always by default", function(assert) {
+  const controller = this.subject();
+  assert.equal(controller.pollResult, "always");
+});
+
 test("staff_only option is present for staff", function(assert) {
   const controller = this.subject();
   controller.currentUser = { staff: true };