Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions src/Jfsimon/Datagrid/Infra/Handler/LabelHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ class LabelHandler implements HandlerInterface
public function configure(OptionsResolver $resolver)
{
$resolver->setDefaults(array(
LabelExtension::NAME => true,
LabelExtension::NAME.'_trans' => Trans::disable(),
LabelExtension::NAME => true,
LabelExtension::NAME.'_trans' => Trans::disable(),
LabelExtension::NAME.'_formatter' => true,
));
}

Expand All @@ -34,8 +35,13 @@ public function configure(OptionsResolver $resolver)
public function handle(Column $column, Entity $entity = null, array $options = array())
{
$subject = is_string($options[LabelExtension::NAME]) ? $options[LabelExtension::NAME] : $column->getName();

return new Cell($this->getLabel($subject, $column->getGrid()->getName(), $options[LabelExtension::NAME.'_trans']));
$label = $this->getLabel(
$subject,
$column->getGrid()->getName(),
$options[LabelExtension::NAME.'_trans'],
$options[LabelExtension::NAME.'_formatter']
);
return new Cell($label);
}

/**
Expand All @@ -49,11 +55,12 @@ public function getType()
/**
* @param string $subject
* @param string $grid
* @param Trans $trans
* @param Trans $trans
* @param bool $useFormatter
*
* @return Label
*/
private function getLabel($subject, $grid, Trans $trans)
private function getLabel($subject, $grid, Trans $trans, $useFormatter)
{
if ($trans->isEnabled()) {
$label = $trans->resolvePattern(array(
Expand All @@ -67,6 +74,6 @@ private function getLabel($subject, $grid, Trans $trans)

$formatter = new LabelFormatter();

return new Label($formatter->format($subject));
return new Label($useFormatter ? $formatter->format($subject) : $subject);
}
}