From 610e52a5f24e9fc424eae24d7a1ce3b80bd0eadb Mon Sep 17 00:00:00 2001
From: Quentin Ferrer <quentin.ferrer@dbit.lu>
Date: Tue, 5 Jul 2016 16:23:28 +0200
Subject: [PATCH] Fixed condition for the join column

---
 Grid/Source/Entity.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Grid/Source/Entity.php b/Grid/Source/Entity.php
index 681d9acc..432ac908 100644
--- a/Grid/Source/Entity.php
+++ b/Grid/Source/Entity.php
@@ -13,6 +13,7 @@
 namespace APY\DataGridBundle\Grid\Source;
 
 use APY\DataGridBundle\Grid\Column\Column;
+use APY\DataGridBundle\Grid\Column\JoinColumn;
 use APY\DataGridBundle\Grid\Rows;
 use APY\DataGridBundle\Grid\Row;
 use Doctrine\ORM\NoResultException;
@@ -350,7 +351,7 @@ public function execute($columns, $page = 0, $limit = 0, $maxResults = null, $gr
             }
 
             if ($column->isSorted()) {
-                if ($column->getType() === 'join') {
+                if ($column instanceof JoinColumn) {
                     $this->query->resetDQLPart('orderBy');
                     foreach($column->getJoinColumns() as $columnName) {
                         $this->query->addOrderBy($this->getFieldName($columnsById[$columnName]), $column->getOrder());
@@ -373,7 +374,7 @@ public function execute($columns, $page = 0, $limit = 0, $maxResults = null, $gr
                 foreach ($filters as $filter) {
                     $operator = $this->normalizeOperator($filter->getOperator());
 
-                    $columnForFilter = ($column->getType() !== 'join') ? $column : $columnsById[$filter->getColumnName()];
+                    $columnForFilter = (!$column instanceof JoinColumn) ? $column : $columnsById[$filter->getColumnName()];
 
                     $fieldName = $this->getFieldName($columnForFilter, false);
                     $bindIndexPlaceholder = "?$bindIndex";