diff --git a/forms/gridfield/GridFieldPrintButton.php b/forms/gridfield/GridFieldPrintButton.php index d4fcc4483..8ab78df9a 100644 --- a/forms/gridfield/GridFieldPrintButton.php +++ b/forms/gridfield/GridFieldPrintButton.php @@ -135,12 +135,22 @@ class GridFieldPrintButton implements GridField_HTMLProvider, GridField_ActionPr //get title for the print view $form = $gridField->getForm(); $currentController = Controller::curr(); - $title = method_exists($currentController, 'Title')?$currentController->Title(): - ($currentController->Title?$currentController->Title: - ($form?$form->Name():'')); - if($fieldTitle = $gridField->Title()) $title .= ($title?' - ':'').$fieldTitle; - - //$state = $gridField->getState(false)->__toString(); + $title = ''; + if(method_exists($currentController, 'Title')) { + $title = $currentController->Title(); + }else{ + if($currentController->Title){ + $title = $currentController->Title; + }else{ + if($form->Name()){ + $title = $form->Name(); + } + } + } + if($fieldTitle = $gridField->Title()){ + if($title) $title .= " - "; + $title .= $fieldTitle; + } $ret = new ArrayData( array( diff --git a/templates/Includes/GridField_print.ss b/templates/Includes/GridField_print.ss index ccc402ba2..1932ef71a 100644 --- a/templates/Includes/GridField_print.ss +++ b/templates/Includes/GridField_print.ss @@ -16,9 +16,9 @@

- Printed at $Datetime.Nice + <% _t('GridField.PRINTEDAT', 'Printed at') %> $Datetime.Time, $Datetime.Date
- Printed by $Member.Name + <% _t('GridField.PRINTEDBY', 'Printed by') %> $Member.Name

\ No newline at end of file