FIX: Modifications to GridFieldExportButton to allow ArrayList use in…

… SS_Report
silverstripe · May 6, 2015 · 828ad6e · nglasl · Jun 2, 2015 · oddnoc
1 parent 5f5662b
commit 828ad6e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/forms/gridfield/GridFieldExportButton.php b/forms/gridfield/GridFieldExportButton.php
@@ -132,7 +132,7 @@ public function generateExportFileData($gridField) {
 		}
 
 		foreach($items->limit(null) as $item) {
-			if($item->hasMethod('canView') && $item->canView()) {
+			if(!$item->hasMethod('canView') || $item->canView()) {
 				$columnData = array();
 
 				foreach($csvColumns as $columnSource => $columnHeader) {
@@ -146,16 +146,23 @@ public function generateExportFileData($gridField) {
 						$value = $columnHeader($relObj);
 					} else {
 						$value = $gridField->getDataFieldValue($item, $columnSource);
+
+						if(!$value) {
+							$value = $gridField->getDataFieldValue($item, $columnHeader);
+						}
 					}
 
 					$value = str_replace(array("\r", "\n"), "\n", $value);
 					$columnData[] = '"' . str_replace('"', '""', $value) . '"';
 				}
+
 				$fileData .= implode($separator, $columnData);
 				$fileData .= "\n";
 			}
 
-			$item->destroy();
+			if($item->hasMethod('destroy')) {
+				$item->destroy();
+			}
 		}
 
 		return $fileData;