Fixed results view

collective · Jan 25, 2017 · ecc2922 · ecc2922
1 parent ba84227
commit ecc2922
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Products/PloneSurvey/browser/questions/question_matrix_macro.pt b/Products/PloneSurvey/browser/questions/question_matrix_macro.pt
@@ -40,7 +40,7 @@
             </th>
         </tr>
         </thead>
-        
+
         <tr tal:repeat="matrix_question matrix_questions"
             tal:attributes="class python:repeat['matrix_question'].odd() and 'odd' or 'even'">
             <div tal:omit-tag=""
@@ -83,7 +83,7 @@
                     <select tal:condition="python: question.getInputType() == 'multipleSelect' and hasOptions"
                             tal:define="answer python:request.get(str(qid) + '-' + str(mqid), None) or matrix_question.getAnswerFor(member_id);"
                             multiple="multiple"
-                            tal:attributes="name string:${qid}-${mqid}; 
+                            tal:attributes="name string:${qid}-${mqid};
                                             id string:${qid}-${mqid};">
                         <option tal:repeat="option question/getQuestionOptions"
                                 class="noborder"
@@ -103,7 +103,7 @@
                            tal:attributes="value option;
                                            name string:${qid}-${mqid};
                                            id string:${qid}-${mqid};
-                                           checked python: answer and option in answer;"/>
+                                           checked python: answer and str(option) in answer;"/>
                 </td>
             </div>
         </tr>

diff --git a/Products/PloneSurvey/content/BaseQuestion.py b/Products/PloneSurvey/content/BaseQuestion.py
@@ -102,12 +102,22 @@ def getAnswerFor(self, userid):
         if self.getInputType() in ['multipleSelect', 'checkbox']:
             if type(answer) == 'NoneType':
                 return []
+            if isinstance(answer, int):
+                return [str(answer)]
+
         if self.getInputType() in ['radio', 'selectionBox']:
             if not answer:
-                return ""
+                return []
             if isinstance(answer, unicode):
                 answer = answer.encode('utf8')
-            return str(answer)
+            return [str(answer)]
+
+        if self.getInputType() in ['area']:
+            if not answer:
+                return ''
+            if isinstance(answer, unicode):
+                answer = answer.encode('utf8')
+
         return answer
 
     security.declareProtected(permissions.View, 'getCommentsFor')