shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #1633 Fixed: Broken images displayed in User List page

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-10-10 10:33:53 +03:00
parent b2d534b5d9
commit 5c8fbd4104
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Auth/User.php
View File

@ -115,7 +115,7 @@ class User extends Authenticatable
} }
} }
if (!empty($value) && !$this->hasMedia('picture')) { if (!empty($value)) {
return $value; return $value;
} elseif (!$this->hasMedia('picture')) { } elseif (!$this->hasMedia('picture')) {
return false; return false;

6
resources/views/partials/admin/navbar.blade.php
View File

@ -227,8 +227,10 @@
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<div class="media align-items-center"> <div class="media align-items-center">
@if (is_object($user->picture)) @if (setting('default.use_gravatar', '0') == '1')
<img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}"/> <img src="{{ $user->picture }}" alt="{{ $user->name }}" class="rounded-circle image-style user-img" title="{{ $user->name }}">
@elseif (is_object($user->picture))
<img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}" title="{{ $user->name }}">
@else @else
<img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/> <img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
@endif @endif

6
resources/views/partials/portal/navbar.blade.php
View File

@ -91,8 +91,10 @@
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<div class="media align-items-center"> <div class="media align-items-center">
@if (is_object($user->picture)) @if (setting('default.use_gravatar', '0') == '1')
<img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}"/> <img src="{{ $user->picture }}" alt="{{ $user->name }}" class="rounded-circle image-style user-img" title="{{ $user->name }}">
@elseif (is_object($user->picture))
<img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}" title="{{ $user->name }}">
@else @else
<img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/> <img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
@endif @endif