mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 05:34:06 -08:00
Merge pull request #15408 from snipe/redirect-on-print-if-user-invalid
Check that the user exists before trying to print
This commit is contained in:
commit
58e366a063
|
@ -601,29 +601,29 @@ class UsersController extends Controller
|
||||||
/**
|
/**
|
||||||
* Print inventory
|
* Print inventory
|
||||||
*
|
*
|
||||||
* @author Aladin Alaily
|
|
||||||
* @since [v1.8]
|
* @since [v1.8]
|
||||||
* @return \Illuminate\Http\RedirectResponse
|
* @author Aladin Alaily
|
||||||
*/
|
*/
|
||||||
public function printInventory($id)
|
public function printInventory($id)
|
||||||
{
|
{
|
||||||
$this->authorize('view', User::class);
|
$this->authorize('view', User::class);
|
||||||
$user = User::where('id', $id)->withTrashed()->first();
|
if ($user = User::where('id', $id)->withTrashed()->first()) {
|
||||||
|
|
||||||
|
|
||||||
// Make sure they can view this particular user
|
$this->authorize('view', $user);
|
||||||
$this->authorize('view', $user);
|
$assets = Asset::where('assigned_to', $id)->where('assigned_type', User::class)->with('model', 'model.category')->get();
|
||||||
|
$accessories = $user->accessories()->get();
|
||||||
|
$consumables = $user->consumables()->get();
|
||||||
|
|
||||||
$assets = Asset::where('assigned_to', $id)->where('assigned_type', User::class)->with('model', 'model.category')->get();
|
return view('users/print')->with('assets', $assets)
|
||||||
$accessories = $user->accessories()->get();
|
->with('licenses', $user->licenses()->get())
|
||||||
$consumables = $user->consumables()->get();
|
->with('accessories', $accessories)
|
||||||
|
->with('consumables', $consumables)
|
||||||
|
->with('show_user', $user)
|
||||||
|
->with('settings', Setting::getSettings());
|
||||||
|
}
|
||||||
|
|
||||||
|
return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
|
||||||
|
|
||||||
return view('users/print')->with('assets', $assets)
|
|
||||||
->with('licenses', $user->licenses()->get())
|
|
||||||
->with('accessories', $accessories)
|
|
||||||
->with('consumables', $consumables)
|
|
||||||
->with('show_user', $user)
|
|
||||||
->with('settings', Setting::getSettings());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue