Fix MultipleChoiceType pre-filling issues

Author: spinn

src/components/FlowForm.vue

@@ -354,6 +354,8 @@
 
                 q.componentInstance.question = model
 
+                model.resetOptions()
+
                 questions.push(model)
               })
           }

src/components/QuestionTypes/MultipleChoiceType.vue

@@ -70,17 +70,6 @@
     },
 
     mounted() {
-      if (this.question.answer) {
-        // Set initial answer when we have one
-        this.question.options.forEach(o => {
-          const optionValue = o.choiceValue()
-
-          if (this.question.answer === optionValue || (Array.isArray(this.question.answer) && this.question.answer.indexOf(optionValue) !== -1)) {
-            this.toggleAnswer(o)
-          }
-        })
-      }
-
       this.addKeyListener()
     },
 

src/models/QuestionModel.js

@@ -127,6 +127,8 @@ export default class QuestionModel {
     if (this.multiple && !Array.isArray(this.answer)) {
       this.answer = this.answer ? [this.answer] : []
     }
+
+    this.resetOptions()
   }
 
   getJumpId() {
@@ -158,4 +160,36 @@ export default class QuestionModel {
 
     this.index = index
   }
+
+  resetOptions() {
+    if (this.options) {
+      const isArray = Array.isArray(this.answer)
+      let numSelected = 0
+
+      this.options.forEach(o => {
+        const optionValue = o.choiceValue()
+
+        if (this.answer === optionValue || (isArray && this.answer.indexOf(optionValue) !== -1)) {
+          o.selected = true
+          ++numSelected
+        }
+      })
+
+      if (this.allowOther) {
+        let otherAnswer = null
+
+        if (isArray) {
+          if (this.answer.length && this.answer.length !== numSelected) {
+            otherAnswer = this.answer[this.answer.length - 1]
+          }
+        } else if (this.options.map(o => o.choiceValue()).indexOf(this.answer) === -1) {
+          otherAnswer = this.answer
+        }
+
+        if (otherAnswer !== null) {
+          this.other = otherAnswer
+        }
+      }
+    }
+  }
 }