diff --git a/app/Http/Controllers/Corps/BlacklistController.php b/app/Http/Controllers/Blacklist/BlacklistController.php similarity index 92% rename from app/Http/Controllers/Corps/BlacklistController.php rename to app/Http/Controllers/Blacklist/BlacklistController.php index c009b5f9f..6b5303a4e 100644 --- a/app/Http/Controllers/Corps/BlacklistController.php +++ b/app/Http/Controllers/Blacklist/BlacklistController.php @@ -1,6 +1,6 @@ $charId, 'name' => $request->name, 'reason' => $request->reason, + 'lister_id' => auth()->user()->getId(), + 'lister_name' => auth()->user()->getName(), ]); } else { //Return the view @@ -77,19 +82,15 @@ class BlacklistController extends Controller } public function DisplayBlacklist() { - //Middleware needed - $this->middleware('permission:corp.recruiter'); //Get the entire blacklist - $blacklist = BlacklistUser::all(); + $blacklist = BlacklistUser::all()->paginate(50); //Return the view with the data return view('blacklist.list')->with('blacklist', $blacklist); } public function SearchInBlacklist(Request $request) { - //Middleware needed - $this->middleware('permission:corp.recruiter'); //Validate the input from the form $this->validate($request, [ diff --git a/app/Models/Charcter/CharacterClone.php b/app/Models/Charcter/CharacterClone.php deleted file mode 100644 index bb8aa9635..000000000 --- a/app/Models/Charcter/CharacterClone.php +++ /dev/null @@ -1,24 +0,0 @@ -string('character_id')->unique(); $table->string('name')->unique(); $table->text('reason'); + $table->string('lister_id'); + $table->string('lister_name'); $table->timestamps(); }); } diff --git a/resources/views/blacklist/list.blade.php b/resources/views/blacklist/list.blade.php index 1d5c7a835..c17e804b7 100644 --- a/resources/views/blacklist/list.blade.php +++ b/resources/views/blacklist/list.blade.php @@ -29,4 +29,7 @@ +@if($blacklist != null) +{{ $blacklist->links() }} +@endif @endsection \ No newline at end of file diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php index 04b05341a..edc905f4d 100644 --- a/resources/views/layouts/navbar.blade.php +++ b/resources/views/layouts/navbar.blade.php @@ -86,6 +86,19 @@ @endif + @if(auth()->user()->hasRole('User') || auth()->user()->hasRole('Admin')) +