Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for ?with query when using hashed_id

Browse Source
This commit is contained in:
David Bomba 2023-04-27 16:36:58 +10:00
parent 9dee71bc92
commit d884537e20
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Filters/ClientFilters.php
View File

@ -18,6 +18,7 @@ use Illuminate\Database\Eloquent\Builder;
*/
class ClientFilters extends QueryFilters
{
/**
* Filter by name.
*

10
app/Filters/QueryFilters.php
View File

@ -293,8 +293,16 @@ abstract class QueryFilters
return $this->builder;
}
public function with(string $value): Builder
public function with(string $value = ''): Builder
{
if (strlen($value) == 0) {
return $this->builder;
}
if($this->with_property == 'id') {
$value = $this->decodePrimaryKey($value);
}
return $this->builder
->orWhere($this->with_property, $value)
->orderByRaw("{$this->with_property} = ? DESC", [$value])

18
app/Providers/AppServiceProvider.php
View File

@ -40,15 +40,15 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
// DB::listen(function($query) {
// nlog(
// $query->sql,
// [
// 'bindings' => $query->bindings,
// 'time' => $query->time
// ]
// );
// });
\DB::listen(function($query) {
nlog(
$query->sql,
[
'bindings' => $query->bindings,
'time' => $query->time
]
);
});
// Model::preventLazyLoading(
// !$this->app->isProduction()