mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 07:34:06 -08:00
Merge pull request #12631 from snipe/bug/sc-20297/expected-checkin-email-report-link-back-error
Dynamically determine target route for expected checkin emails
This commit is contained in:
commit
182a5ea5fc
|
@ -547,6 +547,28 @@ class Asset extends Depreciable
|
||||||
return strtolower(class_basename($this->assigned_type));
|
return strtolower(class_basename($this->assigned_type));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This is annoying, but because we don't say "assets" in our route names, we have to make an exception here
|
||||||
|
* @todo - normalize the route names - API endpoint URLS can stay the same
|
||||||
|
*
|
||||||
|
* @author [A. Gianotto] [<snipe@snipe.net>]
|
||||||
|
* @since [v6.1.0]
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function targetShowRoute()
|
||||||
|
{
|
||||||
|
$route = str_plural($this->assignedType());
|
||||||
|
if ($route=='assets') {
|
||||||
|
return 'hardware';
|
||||||
|
}
|
||||||
|
|
||||||
|
return $route;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the asset's location based on default RTD location
|
* Get the asset's location based on default RTD location
|
||||||
*
|
*
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
@php
|
@php
|
||||||
$checkin = Helper::getFormattedDateObject($asset->expected_checkin, 'date');
|
$checkin = Helper::getFormattedDateObject($asset->expected_checkin, 'date');
|
||||||
@endphp
|
@endphp
|
||||||
| [{{ $asset->present()->name }}]({{ route('hardware.show', ['hardware' => $asset->id]) }}) | [{{ $asset->assigned->present()->fullName }}]({{ route('users.show', ['user'=>$asset->assigned->id]) }}) | {{ $checkin['formatted'] }}
|
| [{{ $asset->present()->name }}]({{ route('hardware.show', ['hardware' => $asset->id]) }}) | [{{ $asset->assigned->present()->fullName }}]({{ route($asset->targetShowRoute().'.show', [$asset->assigned->id]) }}) | {{ $checkin['formatted'] }}
|
||||||
@endforeach
|
@endforeach
|
||||||
@endcomponent
|
@endcomponent
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue