DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-06-30 14:20:34 -07:00
parent 423e7439ee 656efc5f92
commit 97afafdd48
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Users/UsersController.php
View file

@ -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');

10
resources/views/users/view.blade.php
View file

@ -158,7 +158,7 @@
<div class="col-md-12 text-center">
@if (($user->isSuperUser()) || ($user->hasAccess('admin')))
<i class="fas fa-crown fa-2x {{ ($user->isSuperUser()) ? 'text-danger' : ' text-orange'}}"></i>
<i class="fas fa-crown fa-2x{{ ($user->isSuperUser()) ? ' text-danger' : ' text-orange'}}"></i>
<div class="{{ ($user->isSuperUser()) ? 'text-danger' : ' text-orange'}}" style="font-weight: bold">{{ ($user->isSuperUser()) ? 'superadmin' : 'admin'}}</div>
@endif
@ -280,13 +280,9 @@
<div class="col-md-9">
@if ($user->isSuperUser())
<label class="label label-danger">
<i class="fas fa-crown" title="superuser"></i>
</label>&nbsp;
<label class="label label-danger"><i class="fas fa-crown" title="superuser"></i></label>&nbsp;
@elseif ($user->hasAccess('admin'))
<label class="label label-warning">
<i class="fas fa-crown" title="admin"></i>
</label>&nbsp;
<label class="label label-warning"><i class="fas fa-crown" title="admin"></i></label>&nbsp;
@endif
{{ $user->username }}