2028 - Working with tags, categories, and handling multi value fields…

… correctly for regular non-custom fields
ushahidi · Sep 11, 2017 · c4b0fdd · c4b0fdd
1 parent 18c5902
commit c4b0fdd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/application/classes/Ushahidi/Formatter/Post/CSV.php b/application/classes/Ushahidi/Formatter/Post/CSV.php
@@ -79,10 +79,11 @@ protected function generateCSVRecords($records)
 						$setValue = isset($recordVal[$headingKey][$keySet[1]])? ($recordVal[$headingKey][$keySet[1]]): '';
 					}
 				} else{
-					if (is_array($record[$headingKey]) && empty($record[$headingKey])) {
-						$record[$headingKey] = '';
+					if ( !isset($record[$headingKey]) || (is_array($record[$headingKey]) && empty($record[$headingKey]))) {
+						$setValue = '';
+					} else {
+						$setValue = $record[$headingKey];
 					}
-					$setValue = isset($record[$headingKey]) ? $record[$headingKey] : '';
 				}
 				$values[] = $setValue;
 			}

diff --git a/application/classes/Ushahidi/Repository/Post/Export.php b/application/classes/Ushahidi/Repository/Post/Export.php
@@ -24,19 +24,20 @@ public function retrieveColumnNameData($data) {
     $attributes = [];
 	foreach ($data['values'] as $key => $val)
     {
-      $attribute = $this->form_attribute_repo->getByKey($key);
-	/**
-	 * @DEVNOTE form_stage_id can be NULL. Why is that? solve that scenario and get back here.
-	 */
-	 $attributes[$key] = ['label' => $attribute->label, 'priority'=> $attribute->priority, 'stage' => $attribute->form_stage_id, 'type'=> $attribute->type];
+        $attribute = $this->form_attribute_repo->getByKey($key);
+		/**
+		 * @DEVNOTE form_stage_id can be NULL. Why is that? solve that scenario and get back here.
+		 */
+	 	$attributes[$key] = ['label' => $attribute->label, 'priority'=> $attribute->priority, 'stage' => $attribute->form_stage_id, 'type'=> $attribute->type];
+
+		// Set attribute names
+		if ($attribute->type === 'tags') {
+			$data['values'][$key] = $this->retrieveTagNames($val);
+		}
     }
 
     $data += ['attributes' => $attributes];
 
-	// Set attribute names
-	if ($attribute->type === 'tags') {
-	  $data['values'][$key] = $this->retrieveTagNames($val);
-    }
 
     // Set Set names
     if (!empty($data['sets'])) {