tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5538 from TimeZoneOne/fix-export-zero

Browse Source 
Fix bug, export button cannot export value '0'
This commit is contained in:
Daniel Hensby 2016-05-16 15:12:41 +01:00
commit 9e5a0b82a2
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forms/gridfield/GridFieldExportButton.php
View File

@ -146,7 +146,7 @@ class GridFieldExportButton implements GridField_HTMLProvider, GridField_ActionP
} else {
$value = $gridField->getDataFieldValue($item, $columnSource);
if(!$value) {
if($value === null) {
$value = $gridField->getDataFieldValue($item, $columnHeader);
}
}

18
tests/forms/gridfield/GridFieldExportButtonTest.php
View File

@ -115,6 +115,18 @@ class GridFieldExportButtonTest extends SapphireTest {
$button->generateExportFileData($this->gridField)
);
}
public function testZeroValue() {
$button = new GridFieldExportButton();
$button->setExportColumns(array(
'RugbyTeamNumber' => 'Rugby Team Number'
));
$this->assertEquals(
"\"Rugby Team Number\"\n\"2\"\n\"0\"\n",
$button->generateExportFileData($this->gridField)
);
}
}
/**
@ -125,7 +137,8 @@ class GridFieldExportButtonTest_Team extends DataObject implements TestOnly {
private static $db = array(
'Name' => 'Varchar',
'City' => 'Varchar'
'City' => 'Varchar',
'RugbyTeamNumber' => 'Int'
);
public function canView($member = null) {
@ -142,7 +155,8 @@ class GridFieldExportButtonTest_NoView extends DataObject implements TestOnly {
private static $db = array(
'Name' => 'Varchar',
'City' => 'Varchar'
'City' => 'Varchar',
'RugbyTeamNumber' => 'Int'
);
public function canView($member = null) {

2
tests/forms/gridfield/GridFieldExportButtonTest.yml
View File

@ -2,9 +2,11 @@ GridFieldExportButtonTest_Team:
test-team-1:
Name: Test
City: City
RugbyTeamNumber: 2
test-team-2:
Name: Test2
City: City2
RugbyTeamNumber: 0
GridFieldExportButtonTest_NoView:
item1: