From 10e2d7dbbabee7ad787f67c6f009fc5acb5f0ad9 Mon Sep 17 00:00:00 2001 From: cp6 Date: Mon, 31 Oct 2022 11:14:26 +1100 Subject: [PATCH] Fix orderByProcess() input being null Fix orderByProcess() input being null by having the input be 2 if the settings values via the session havent been set --- app/Models/Misc.php | 2 +- app/Models/Reseller.php | 2 +- app/Models/SeedBoxes.php | 2 +- app/Models/Server.php | 2 +- app/Models/Shared.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Models/Misc.php b/app/Models/Misc.php index 008b47c..2363152 100644 --- a/app/Models/Misc.php +++ b/app/Models/Misc.php @@ -25,7 +25,7 @@ class Misc extends Model parent::boot(); static::addGlobalScope('order', function (Builder $builder) { - $array = Settings::orderByProcess(Session::get('sort_on')); + $array = Settings::orderByProcess(Session::get('sort_on') ?? 2);//created_at desc if not set if (!in_array(Session::get('sort_on'), [3, 4, 5, 6], true)) { $builder->orderBy($array[0], $array[1]); } diff --git a/app/Models/Reseller.php b/app/Models/Reseller.php index b6f31bd..afe8f79 100644 --- a/app/Models/Reseller.php +++ b/app/Models/Reseller.php @@ -26,7 +26,7 @@ class Reseller extends Model parent::boot(); static::addGlobalScope('order', function (Builder $builder) { - $array = Settings::orderByProcess(Session::get('sort_on')); + $array = Settings::orderByProcess(Session::get('sort_on') ?? 2);//created_at desc if not set if (!in_array(Session::get('sort_on'), [3, 4, 5, 6], true)) { $builder->orderBy($array[0], $array[1]); } diff --git a/app/Models/SeedBoxes.php b/app/Models/SeedBoxes.php index 712de5b..7e1c0a7 100644 --- a/app/Models/SeedBoxes.php +++ b/app/Models/SeedBoxes.php @@ -26,7 +26,7 @@ class SeedBoxes extends Model parent::boot(); static::addGlobalScope('order', function (Builder $builder) { - $array = Settings::orderByProcess(Session::get('sort_on')); + $array = Settings::orderByProcess(Session::get('sort_on') ?? 2);//created_at desc if not set if (!in_array(Session::get('sort_on'), [3, 4, 5, 6], true)) { $builder->orderBy($array[0], $array[1]); } diff --git a/app/Models/Server.php b/app/Models/Server.php index 8925718..7cec444 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -33,7 +33,7 @@ class Server extends Model parent::boot(); static::addGlobalScope('order', function (Builder $builder) { - $array = Settings::orderByProcess(Session::get('sort_on')); + $array = Settings::orderByProcess(Session::get('sort_on') ?? 2);//created_at desc if not set if (!in_array(Session::get('sort_on'), [3, 4, 5, 6], true)) { $builder->orderBy($array[0], $array[1]); } diff --git a/app/Models/Shared.php b/app/Models/Shared.php index 953e433..3cca635 100644 --- a/app/Models/Shared.php +++ b/app/Models/Shared.php @@ -26,7 +26,7 @@ class Shared extends Model parent::boot(); static::addGlobalScope('order', function (Builder $builder) { - $array = Settings::orderByProcess(Session::get('sort_on')); + $array = Settings::orderByProcess(Session::get('sort_on') ?? 2);//created_at desc if not set if (!in_array(Session::get('sort_on'), [3, 4, 5, 6], true)) { $builder->orderBy($array[0], $array[1]); }