fix multiple choice on export + fix insert database

Kunstmaan · Jul 17, 2014 · beb3260 · beb3260
1 parent 59fc57f
commit beb3260
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Entity/FormSubmissionFieldTypes/ChoiceFormSubmissionField.php b/Entity/FormSubmissionFieldTypes/ChoiceFormSubmissionField.php
@@ -77,7 +77,7 @@ public function __toString()
             if (is_array($values) && sizeof($values) > 0) {
                 $result = array();
                 foreach ($values as $value) {
-                    $result[] = array_key_exists($value, $choices) ? $choices[$value] : $value;
+                    $result[] = array_key_exists($value, $choices) ? trim($choices[$value]) : $value;
                 }
                 return implode(", ", $result);
             } else {

diff --git a/Entity/PageParts/ChoicePagePart.php b/Entity/PageParts/ChoicePagePart.php
@@ -89,6 +89,7 @@ public function getDefaultView()
     public function adaptForm(FormBuilderInterface $formBuilder, ArrayObject $fields)
     {
         $choices = explode("\n", $this->getChoices());
+        $choices = array_map('trim', $choices);
 
         $cfsf = new ChoiceFormSubmissionField();
         $cfsf->setFieldName("field_" . $this->getUniqueId());