Skip to content

A free open source IT asset/license management system

Fixed #18989 - better wrapping for auth self.profile checks

snipe626cd6cb2e36
diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index 7371bce112..d0db5f1c25 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -438,7 +438,7 @@ return [
'timezone' => 'Timezone',
'test_mail' => 'Test Mail',
'profile_edit' => 'Edit Profile',
- 'profile_edit_help' => 'Allow users to edit their own profiles.',
+ 'profile_edit_help' => 'Allow users to edit their own profiles. (This does not include accessibility settings like light/dark mode, audio feedback, or link colors.)',
'default_avatar' => 'Custom Default Avatar',
'default_avatar_help' => 'This image will be displayed as a profile if a user does not have a profile photo.',
'restore_default_avatar' => 'Restore <a href=":default_avatar" data-toggle="lightbox" data-type="image">original system default avatar</a>',
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 0cd7ad33ce..5ae1cc0a6f 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -1352,8 +1352,9 @@
<!-- User Account: style can be found in dropdown.less -->
- @if (auth()->check())
+ @auth
<li class="dropdown user user-menu">
+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
@if (auth()->user()->present()->gravatar())
<img src="{{ Auth::user()->present()->gravatar() }}" class="user-image"
@@ -1367,8 +1368,11 @@
<strong class="caret"></strong>
</span>
</a>
+
+
<ul class="dropdown-menu">
- <!-- User image -->
+
+ <!-- User assets -->
@can('self.profile')
<li {!! (request()->is('account/view-assets') ? ' class="active"' : '') !!}>
<a href="{{ route('view-assets') }}">
@@ -1376,6 +1380,7 @@
{{ trans('general.viewassets') }}
</a>
</li>
+ @endcan
@can('viewRequestable', \App\Models\Asset::class)
@@ -1386,6 +1391,7 @@
</a></li>
@endcan
+ @can('self.profile')
<li {!! (request()->is('account/accept') ? ' class="active"' : '') !!}>
<a href="{{ route('account.accept') }}">
<x-icon type="checkmark" class="fa-fw" />
@@ -1394,7 +1400,7 @@
</li>
@endcan
- <li {!! (request()->is('account/password') ? ' class="active"' : '') !!}>
+ <li {!! (request()->is('account/profile') ? ' class="active"' : '') !!}>
<a href="{{ route('profile') }}">
<x-icon type="user" class="fa-fw" />
{{ trans('general.editprofile') }}
@@ -1403,7 +1409,7 @@
@can('self.profile')
@if (Auth::user()->ldap_import!='1')
- <li {!! (request()->is('account/profile') ? ' class="active"' : '') !!}>
+ <li {!! (request()->is('account/password') ? ' class="active"' : '') !!}>
<a href="{{ route('account.password.index') }}">
<x-icon type="password" class="fa-fw"/>
{{ trans('general.changepassword') }}
@@ -1426,6 +1432,7 @@
</a>
</li>
@endcan
+
<li class="divider"></li>
<li>
<a href="{{ route('logout.get') }}"
@@ -1442,7 +1449,7 @@
</li>
</ul>
</li>
- @endif
+ @endauth
@can('superadmin')