From 46d055cf74469479480b6079e143ab0914738e5c Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 30 Jun 2022 14:17:53 -0700 Subject: [PATCH 1/2] Fixed weird extra padding on crown Signed-off-by: snipe --- resources/views/users/view.blade.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 296453bf8..5f2af9b83 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -158,7 +158,7 @@
@if (($user->isSuperUser()) || ($user->hasAccess('admin'))) - +
{{ ($user->isSuperUser()) ? 'superadmin' : 'admin'}}
@endif @@ -280,13 +280,9 @@
@if ($user->isSuperUser()) -   +   @elseif ($user->hasAccess('admin')) -   +   @endif {{ $user->username }} From 656efc5f925025d29d4d3c462bd32fb0b84a720d Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 30 Jun 2022 14:20:15 -0700 Subject: [PATCH 2/2] Fixed missing trans() Signed-off-by: snipe --- app/Http/Controllers/Users/UsersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index 1fcfad9cf..421e07b4e 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -632,7 +632,7 @@ class UsersController extends Controller { $user= User::where('id', $id)->first(); $user->notify((new CurrentInventory($user))); - return redirect()->back()->with('success', 'admin/users/general.user_notified'); + return redirect()->back()->with('success', trans('admin/users/general.user_notified')); } return redirect()->back()->with('error', 'admin/accessories/message.user_does_not_exist');