diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php index aa3dfe30c6..de59167207 100644 --- a/app/Presenters/LocationPresenter.php +++ b/app/Presenters/LocationPresenter.php @@ -378,7 +378,7 @@ class LocationPresenter extends Presenter public function formattedNameLink() { - if (auth()->user()->can('location.view', $this)) { + if (auth()->user()->can('locations.view', $this)) { return ($this->tag_color ? "" : '').''.e($this->name).''; } diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 72f2263262..12581ce9b2 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -324,7 +324,7 @@ {{ trans('admin/users/table.email') }}
- {{ $user->email }} + {{ $user->email }}
@endif @@ -336,7 +336,7 @@ {{ trans('general.website') }}
- {{ $user->website }} + {{ $user->website }}
@endif @@ -348,7 +348,7 @@ {{ trans('admin/users/table.phone') }}
- {{ $user->phone }} + {{ $user->phone }}
@endif @@ -360,7 +360,7 @@ {{ trans('admin/users/table.location') }}
- {{ link_to_route('locations.show', $user->userloc->name, [$user->userloc->id]) }} + {!! $user->userloc->present()->formattedNameLink !!}
@endif @@ -528,10 +528,11 @@ {{ $asset->serial }} - {{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }} + {!! ($asset->defaultLoc) ? $asset->defaultLoc->present()->formattedNameLink : '' !!} + - {!! ($asset->defaultLoc) ? $asset->defaultLoc->present()->formattedNameLink : trans('general.deleted') !!} + {!! ($asset->location) ? $asset->location->present()->formattedNameLink : '' !!} {{ ($asset->expected_checkin) ? $asset->expected_checkin_formatted_date : '' }}