FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes For GDPR/Deleted Users (#1164)

Browse Source 
* Fix DeletedUsers being displayed at Homepage

Deleted users should not be displayed at homepage / newest pilots list. PR fixes that problem.

* Do Not Display Deleted Users with LatestPireps

As the main page, Latest Pilots widget should not display GDPR/Soft deleted users too.

* StyleFix
This commit is contained in:
B.Fatih KOZ
2021-05-03 15:46:21 +03:00
committed by GitHub
parent ec6cb42bfd
commit 5094375e13
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Frontend/HomeController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Frontend; namespace App\Http\Controllers\Frontend;
use App\Contracts\Controller; use App\Contracts\Controller;
use App\Models\Enums\UserState;
use App\Models\User; use App\Models\User;
use Illuminate\Database\QueryException; use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
@@ -15,7 +16,7 @@ class HomeController extends Controller
public function index() public function index()
{ {
try { try {
$users = User::orderBy('created_at', 'desc')->take(4)->get(); $users = User::where('state', '!=', UserState::DELETED)->orderBy('created_at', 'desc')->take(4)->get();
} catch (\PDOException $e) { } catch (\PDOException $e) {
Log::emergency($e); Log::emergency($e);
return view('system/errors/database_error', [ return view('system/errors/database_error', [

4
app/Widgets/LatestPilots.php
View File

@@ -3,6 +3,7 @@
namespace App\Widgets; namespace App\Widgets;
use App\Contracts\Widget; use App\Contracts\Widget;
use App\Models\Enums\UserState;
use App\Repositories\UserRepository; use App\Repositories\UserRepository;
/** /**
@@ -20,10 +21,11 @@ class LatestPilots extends Widget
public function run() public function run()
{ {
$userRepo = app(UserRepository::class); $userRepo = app(UserRepository::class);
$userRepo = $userRepo->where('state', '!=', UserState::DELETED)->orderby('created_at', 'desc')->take($this->config['count'])->get();
return view('widgets.latest_pilots', [ return view('widgets.latest_pilots', [
'config' => $this->config, 'config' => $this->config,
'users' => $userRepo->with(['airline'])->recent($this->config['count']), 'users' => $userRepo,
]); ]);
} }
} }