Update dump with new migration.

2016-12-29 12:04:28 -05:00
parent aa2d3cf026
commit 62dd474d44
4 changed files with 28 additions and 9 deletions
@@ -550,7 +550,7 @@ class UsersController extends Controller
     */
    public function show($userId = null)
    {
-        if(!$user = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($userId)) {
+        if(!$user = User::with('assignedAssets', 'assignedAssets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($userId)) {
            $error = trans('admin/users/message.user_not_found', compact('id'));
            // Redirect to the user management page
            return redirect()->route('users.index')->with('error', $error);