Skip to content

Update Relationship.php #984

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
robincsamuel wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Update Relationship.php #984

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9251095
Update Relationship.php
robincsamuel Feb 1, 2016
5f1c531
Update Relationship.php
robincsamuel Feb 1, 2016
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
3 changes: 2 additions & 1 deletion src/Frozennode/Administrator/DataTable/Columns/Relationships/Relationship.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
namespace Frozennode\Administrator\DataTable\Columns\Relationships;

use Frozennode\Administrator\DataTable\Columns\Column;
use Illuminate\Support\Facades\DB;

/**
* The Column class helps us construct columns from models. It can be used to derive column information from a model, or it can be
Expand Down Expand Up @@ -102,7 +103,7 @@ public function getRelationshipWheres($relationship, $tableAlias, $pivotAlias =
foreach ($query->wheres as &$where)
{
//alias the where columns
$where['column'] = $this->aliasRelationshipWhere($where['column'], $tableAlias, $pivotAlias, $pivot);
$where['column'] = DB::raw($this->aliasRelationshipWhere($where['column'], $tableAlias, $pivotAlias, $pivot));
}

$sql = $query->toSql();
Expand Down