From 8b4821f1393a1fad31d3ba3cf30679d483197664 Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Sun, 27 Jun 2021 16:01:02 +0200
Subject: [PATCH] fix: fix layout selection (#5313)

---
 app/Http/Controllers/SettingsController.php | 9 ++++-----
 app/Http/Requests/SettingsRequest.php       | 2 +-
 app/Models/User/User.php                    | 3 ++-
 resources/views/settings/index.blade.php    | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 316cfa230fc..3c6b3b25854 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -98,13 +98,12 @@ public function save(SettingsRequest $request)
                 'locale',
                 'currency_id',
                 'name_order',
-            ]) + [
-                'fluid_container' => $request->input('layout'),
-                'temperature_scale' => $request->input('temperature_scale'),
-            ]
+                'fluid_container',
+                'temperature_scale',
+            ])
         );
 
-        if ($user->email != $request->input('email')) {
+        if ($user->email !== $request->input('email')) {
             app(EmailChange::class)->execute([
                 'account_id' => $user->account_id,
                 'email' => $request->input('email'),
diff --git a/app/Http/Requests/SettingsRequest.php b/app/Http/Requests/SettingsRequest.php
index 20c9995f0bf..97e3da70a2a 100644
--- a/app/Http/Requests/SettingsRequest.php
+++ b/app/Http/Requests/SettingsRequest.php
@@ -19,7 +19,7 @@ public function rules()
             'last_name' => 'required|max:255',
             'email' => 'required|email|max:255|unique:users,email,'.$this->id,
             'timezone' => 'required|string',
-            'layout' => 'required|bool',
+            'fluid_container' => 'required|bool',
             'temperature_scale' => [
                 'required',
                 'string',
diff --git a/app/Models/User/User.php b/app/Models/User/User.php
index 1370ba4f180..4879fd4c774 100644
--- a/app/Models/User/User.php
+++ b/app/Models/User/User.php
@@ -65,6 +65,7 @@ class User extends Authenticatable implements MustVerifyEmail, HasLocalePreferen
     protected $casts = [
         'profile_new_life_event_badge_seen' => 'boolean',
         'admin' => 'boolean',
+        'fluid_container' => 'boolean',
     ];
 
     /**
@@ -152,7 +153,7 @@ public function getContactsSortOrderAttribute($value): string
      */
     public function getFluidLayout(): string
     {
-        if ($this->fluid_container == 'true') {
+        if ($this->fluid_container) {
             return 'container-fluid';
         } else {
             return 'container';
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 2f073774192..82f8e9580de 100644
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -134,10 +134,10 @@
 
                 {{-- Layout --}}
                 <div class="form-group">
-                  <label for="layout" class="mb2 b">{{ trans('settings.layout') }}</label>
-                  <select class="form-control" name="layout" id="layout">
-                    <option value='0' {{ (auth()->user()->fluid_container == 'false')?'selected':'' }}>{{ trans('settings.layout_small') }}</option>
-                    <option value='1' {{ (auth()->user()->fluid_container == 'true')?'selected':'' }}>{{ trans('settings.layout_big') }}</option>
+                  <label for="fluid_container" class="mb2 b">{{ trans('settings.layout') }}</label>
+                  <select class="form-control" name="fluid_container" id="fluid_container">
+                    <option value='0' {{ auth()->user()->fluid_container ? '' : 'selected' }}>{{ trans('settings.layout_small') }}</option>
+                    <option value='1' {{ auth()->user()->fluid_container ? 'selected' : '' }}>{{ trans('settings.layout_big') }}</option>
                   </select>
                 </div>
               </div>