Added #6489: show asset assignments under user assignments (#7293)

* Add a setting to show assets assigned to other assets #6489

* Update user's views to show assets assigned to other assets #6489

* Add ukrainian and russian translation for the feature #6489 in settings

app/Http/Controllers/SettingsController.php

@@ -334,6 +334,7 @@ class SettingsController extends Controller
         $setting->email_format                    = $request->input('email_format');
         $setting->username_format                 = $request->input('username_format');
         $setting->require_accept_signature        = $request->input('require_accept_signature');
+        $setting->show_assigned_assets            = $request->input('show_assigned_assets', '0');
         if (! config('app.lock_passwords')) {
             $setting->login_note = $request->input('login_note');
         }

app/Http/Controllers/Users/UsersController.php

@@ -9,6 +9,7 @@ use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Group;
 use App\Models\Ldap;
+use App\Models\Setting;
 use App\Models\User;
 use App\Notifications\WelcomeNotification;
 use Auth;
@@ -404,7 +405,8 @@ class UsersController extends Controller
         $userlog = $user->userlog->load('item');
 
         $this->authorize('view', $user);
-        return view('users/view', compact('user', 'userlog'));
+        return view('users/view', compact('user', 'userlog'))
+            ->with('settings', Setting::getSettings());
     }
 
     /**
@@ -604,6 +606,7 @@ class UsersController extends Controller
             ->with('licenses', $show_user->licenses()->get())
             ->with('accessories', $accessories)
             ->with('consumables', $consumables)
-            ->with('show_user', $show_user);
+            ->with('show_user', $show_user)
+            ->with('settings', Setting::getSettings());
     }
 }

app/Http/Controllers/ViewAssetsController.php

@@ -42,13 +42,11 @@ class ViewAssetsController extends Controller
         $userlog = $user->userlog->load('item', 'user', 'target');
 
         if (isset($user->id)) {
-            return view('account/view-assets', compact('user', 'userlog'));
+            return view('account/view-assets', compact('user', 'userlog'))
+                ->with('settings', Setting::getSettings());
         } else {
-            // Prepare the error message
-            $error = trans('admin/users/message.user_not_found', compact('id'));
-
             // Redirect to the user management page
-            return redirect()->route('users.index')->with('error', $error);
+            return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', compact('id')));
         }
         // Redirect to the user management page
         return redirect()->route('users.index')