Skip to content

Add table prefix to related table in search query #960

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.

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

Merged
merged 36 commits into from
Apr 26, 2022
Merged
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
7e81f52
Merge branch 'develop'
sampoyigi Sep 15, 2020
7de4026
Merge branch 'develop'
sampoyigi Sep 30, 2020
11449fb
Merge branch 'develop'
sampoyigi Oct 5, 2020
f631a58
Merge branch 'develop'
sampoyigi Nov 3, 2020
9b30b98
Merge branch 'develop'
sampoyigi Nov 7, 2020
cad7df9
Merge branch 'develop'
sampoyigi Nov 8, 2020
e912e87
Merge branch 'develop'
sampoyigi Nov 17, 2020
52e41a6
Merge branch 'develop'
sampoyigi Dec 10, 2020
f301d05
Merge branch 'develop'
sampoyigi Dec 10, 2020
114811c
Merge branch 'develop'
sampoyigi Jan 5, 2021
5fbc9ef
Merge branch 'develop'
sampoyigi Feb 4, 2021
9b31eee
Merge branch 'develop'
sampoyigi Feb 4, 2021
c136bb3
Merge branch 'develop'
sampoyigi May 18, 2021
310849a
Merge branch 'develop'
sampoyigi Jun 22, 2021
6f37d75
Merge branch 'develop'
sampoyigi Jun 22, 2021
03cd0b1
Merge branch 'develop'
sampoyigi Jul 14, 2021
e762721
Merge branch 'develop'
sampoyigi Jul 28, 2021
41f934e
Merge branch 'develop'
sampoyigi Jul 30, 2021
8960d1e
Merge branch 'develop'
sampoyigi Sep 14, 2021
9e1491f
Merge branch 'develop'
sampoyigi Oct 15, 2021
14fc954
Merge branch 'develop'
sampoyigi Oct 17, 2021
efd709c
Merge branch 'develop'
sampoyigi Nov 1, 2021
3cada99
Merge remote-tracking branch 'origin/develop'
sampoyigi Nov 22, 2021
e2ebc0a
Merge branch 'develop'
sampoyigi Dec 9, 2021
c7a0d8e
Merge branch 'develop'
sampoyigi Jan 4, 2022
80cc31d
Merge branch 'develop'
sampoyigi Feb 9, 2022
3cb5c05
Merge branch 'develop'
sampoyigi Feb 9, 2022
eecb89f
Merge branch 'develop'
sampoyigi Feb 10, 2022
6e72878
Merge branch 'develop'
sampoyigi Feb 23, 2022
5f883c2
Change modules branch alias to 3.x
sampoyigi Feb 23, 2022
b3938e9
Require core modules
sampoyigi Feb 23, 2022
3eb06a6
Merge branch 'develop'
sampoyigi Feb 23, 2022
0c08f3c
Merge branch '3.x'
sampoyigi Mar 30, 2022
2d5564b
Add table prefix to related table in search query
thienvu18 Apr 22, 2022
b21c238
refactor
sampoyigi Apr 26, 2022
c19d43f
Merge branch '3.x' into master
sampoyigi Apr 26, 2022
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
2 changes: 1 addition & 1 deletion app/admin/widgets/Lists.php
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ public function prepareModel()
foreach ($searchableColumns as $column) {
// Relation
if ($this->isColumnRelated($column)) {
$table = $this->model->makeRelation($column->relation)->getTable();
$table = DB::getTablePrefix().$this->model->makeRelation($column->relation)->getTable();
$columnName = isset($column->sqlSelect)
? DB::raw($this->parseTableName($column->sqlSelect, $table))
: $table.'.'.$column->valueFrom;
Expand Down