Skip to content

Removed extra dot from '.columnName' if tableAlias was not present & doctrine's nested results #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alihammad-gist wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed extra dot from '.columnName' if tableAlias was not present & doctrine's nested results #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 15 additions & 6 deletions src/ZfTable/Cell.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@ public function render($type = 'html')

if (is_array($row) || $row instanceof \ArrayAccess) {
$value = (isset($row[$this->getHeader()->getName()])) ? $row[$this->getHeader()->getName()] : '';
// doctrine result array check
if (empty($value) && isset($row[$this->getHeader()->getTableAlias()])) {
$obj = $row[$this->getHeader()->getTableAlias()];
$value = $this->extractFromObject($obj, $this->getHeader()->getName());
}
} elseif (is_object($row)) {
$headerName = $this->getHeader()->getName();
$methodName = 'get' . ucfirst($headerName);
if (method_exists($row, $methodName)) {
$value = $row->$methodName();
} else {
$value = (property_exists($row, $headerName)) ? $row->$headerName : '';
}
$value = $this->extractFromObject($row, $headerName);
}

foreach ($this->decorators as $decorator) {
Expand All @@ -112,4 +112,13 @@ public function render($type = 'html')
return $value;
}
}

protected function extractFromObject($obj, $name)
{
$methodName = 'get' . ucfirst($name);
if (method_exists($obj, $methodName)) {
return $obj->$methodName();
}
return (property_exists($obj, $name)) ? $obj->$name : '';
}
}
23 changes: 11 additions & 12 deletions src/ZfTable/Source/DoctrineQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php
namespace ZfTable\Source;

use ZfTable\Source\AbstractSource;
use Zend\Paginator\Paginator;
use DoctrineORMModule\Paginator\Adapter\DoctrinePaginator as DoctrineAdapter;
use Doctrine\ORM\Tools\Pagination\Paginator as ORMPaginator;
use Zend\Paginator\Paginator;
use ZfTable\Source\AbstractSource;

class DoctrineQueryBuilder extends AbstractSource
{
Expand Down Expand Up @@ -38,37 +38,36 @@ public function getPaginator()
{
if (!$this->paginator) {


$this->order();

$adapter = new DoctrineAdapter(new ORMPaginator($this->query));
$this->paginator = new Paginator($adapter);
$this->initPaginator();
$adapter = new DoctrineAdapter(new ORMPaginator($this->query));
$this->paginator = new Paginator($adapter);
$this->initPaginator();

}
return $this->paginator;
}



protected function order()
{
$column = $this->getParamAdapter()->getColumn();
$order = $this->getParamAdapter()->getOrder();
$order = $this->getParamAdapter()->getOrder();

if (!$column) {
return;
}

$header = $this->getTable()->getHeader($column);
$header = $this->getTable()->getHeader($column);
$tableAlias = ($header) ? $header->getTableAlias() : 'q';

if ($column) {
$this->query->orderBy($tableAlias.'.'.$column, $order);
if (!empty($tableAlias)) {
$column = $tableAlias . '.' . $column;
}
$this->query->orderBy($column, $order);
}
}


public function getQuery()
{
return $this->query;
Expand Down