From 4707f69b91ea96c2acc8886ca1050a86037a99a7 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 11 Oct 2024 15:32:22 +0200
Subject: [PATCH] fix: no manual timezones

---
 app/Livewire/Server/Form.php    | 9 ---------
 app/Livewire/Settings/Index.php | 9 ++-------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/app/Livewire/Server/Form.php b/app/Livewire/Server/Form.php
index c4f25c79d..fe7fc6020 100644
--- a/app/Livewire/Server/Form.php
+++ b/app/Livewire/Server/Form.php
@@ -245,7 +245,6 @@ class Form extends Component
             $newTimezone = $this->server->settings->server_timezone;
             if ($currentTimezone !== $newTimezone || $currentTimezone === '') {
                 $this->server->settings->server_timezone = $newTimezone;
-                $this->server->settings->save();
             }
             $this->server->settings->save();
             $this->server->save();
@@ -255,14 +254,6 @@ class Form extends Component
             return handleError($e, $this);
         }
     }
-
-    public function updatedServerSettingsServerTimezone($value)
-    {
-        $this->server->settings->server_timezone = $value;
-        $this->server->settings->save();
-        $this->dispatch('success', 'Server timezone updated.');
-    }
-
     public function manualCleanup()
     {
         try {
diff --git a/app/Livewire/Settings/Index.php b/app/Livewire/Settings/Index.php
index 754f0929b..eb492e691 100644
--- a/app/Livewire/Settings/Index.php
+++ b/app/Livewire/Settings/Index.php
@@ -28,6 +28,7 @@ class Index extends Component
     protected string $dynamic_config_path = '/data/coolify/proxy/dynamic';
 
     protected Server $server;
+    public $timezones;
 
     protected $rules = [
         'settings.fqdn' => 'nullable',
@@ -53,9 +54,9 @@ class Index extends Component
         'settings.is_auto_update_enabled' => 'Auto Update Enabled',
         'auto_update_frequency' => 'Auto Update Frequency',
         'update_check_frequency' => 'Update Check Frequency',
+        'settings.instance_timezone' => 'Instance Timezone',
     ];
 
-    public $timezones;
 
     public function mount()
     {
@@ -170,12 +171,6 @@ class Index extends Component
         }
     }
 
-    public function updatedSettingsInstanceTimezone($value)
-    {
-        $this->settings->instance_timezone = $value;
-        $this->settings->save();
-        $this->dispatch('success', 'Instance timezone updated.');
-    }
 
     public function render()
     {