diff --git a/app/Http/Controllers/LicensesController.php b/app/Http/Controllers/LicensesController.php index 84891a21e8..2d0dcf5a4a 100755 --- a/app/Http/Controllers/LicensesController.php +++ b/app/Http/Controllers/LicensesController.php @@ -441,17 +441,15 @@ class LicensesController extends Controller public function show($licenseId = null) { - $license = License::find($licenseId); - $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset'); + $license = License::with('assignedusers', 'licenseSeats.user', 'licenseSeats.asset')->find($licenseId); - if (isset($license->id)) { - $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset'); + if ($license) { $this->authorize('view', $license); return view('licenses/view', compact('license')); } - $error = trans('admin/licenses/message.does_not_exist', compact('id')); - return redirect()->route('licenses.index')->with('error', $error); + return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', compact('id'))); } + public function getClone($licenseId = null) { diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php index b0d05f066a..0022f0f72a 100644 --- a/resources/views/users/confirm-bulk-delete.blade.php +++ b/resources/views/users/confirm-bulk-delete.blade.php @@ -2,7 +2,7 @@ {{-- Page title --}} @section('title') -Bulk Checkin & Delete +Bulk Checkin & Delete @parent @stop