File size: 3,445 Bytes
352fe2e | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | diff --git a/src/Forms/GridField/GridFieldPrintButton.php b/src/Forms/GridField/GridFieldPrintButton.php
index 1ec2be669f6..1fc965808e1 100644
--- a/src/Forms/GridField/GridFieldPrintButton.php
+++ b/src/Forms/GridField/GridFieldPrintButton.php
@@ -228,21 +228,23 @@ public function generatePrintData(GridField $gridField)
/** @var DataObject $item */
foreach ($items->limit(null) as $item) {
- $itemRow = new ArrayList();
+ if (!$item->hasMethod('canView') || $item->canView()) {
+ $itemRow = new ArrayList();
- foreach ($printColumns as $field => $label) {
- $value = $gridFieldColumnsComponent
- ? strip_tags($gridFieldColumnsComponent->getColumnContent($gridField, $item, $field))
- : $gridField->getDataFieldValue($item, $field);
+ foreach ($printColumns as $field => $label) {
+ $value = $gridFieldColumnsComponent
+ ? strip_tags($gridFieldColumnsComponent->getColumnContent($gridField, $item, $field))
+ : $gridField->getDataFieldValue($item, $field);
+
+ $itemRow->push(new ArrayData([
+ "CellString" => $value,
+ ]));
+ }
- $itemRow->push(new ArrayData([
- "CellString" => $value,
+ $itemRows->push(new ArrayData([
+ "ItemRow" => $itemRow
]));
}
-
- $itemRows->push(new ArrayData([
- "ItemRow" => $itemRow
- ]));
if ($item->hasMethod('destroy')) {
$item->destroy();
}
diff --git a/tests/php/Forms/GridField/GridFieldPrintButtonTest.php b/tests/php/Forms/GridField/GridFieldPrintButtonTest.php
index 59e73a494ca..f78c305bab8 100644
--- a/tests/php/Forms/GridField/GridFieldPrintButtonTest.php
+++ b/tests/php/Forms/GridField/GridFieldPrintButtonTest.php
@@ -32,6 +32,19 @@ protected function setUp(): void
}
public function testLimit()
+ {
+ $this->assertEquals(42, $this->getTestableRows()->count());
+ }
+
+ public function testCanViewIsRespected()
+ {
+ $orig = TestObject::$canView;
+ TestObject::$canView = false;
+ $this->assertEquals(0, $this->getTestableRows()->count());
+ TestObject::$canView = $orig;
+ }
+
+ private function getTestableRows()
{
$list = TestObject::get();
@@ -48,7 +61,6 @@ public function testLimit()
// Printed data should ignore pagination limit
$printData = $button->generatePrintData($gridField);
- $rows = $printData->ItemRows;
- $this->assertEquals(42, $rows->count());
+ return $printData->ItemRows;
}
}
diff --git a/tests/php/Forms/GridField/GridFieldPrintButtonTest/TestObject.php b/tests/php/Forms/GridField/GridFieldPrintButtonTest/TestObject.php
index 2e8f80cc9d6..dd5638d0926 100644
--- a/tests/php/Forms/GridField/GridFieldPrintButtonTest/TestObject.php
+++ b/tests/php/Forms/GridField/GridFieldPrintButtonTest/TestObject.php
@@ -12,4 +12,11 @@ class TestObject extends DataObject implements TestOnly
private static $db = [
'Name' => 'Varchar'
];
+
+ public static bool $canView = true;
+
+ public function canView($member = null)
+ {
+ return static::$canView;
+ }
}
|