From 18072bbde7383a756b74284ebcf35d339875e91f Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Fri, 8 Sep 2023 14:42:20 +0200
Subject: [PATCH] Fix update of database settings values [SCI-9240]

---
 app/models/settings.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/settings.rb b/app/models/settings.rb
index ca3d4d373..48a1872bf 100644
--- a/app/models/settings.rb
+++ b/app/models/settings.rb
@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
 class Settings < ApplicationRecord
+  attr_accessor :merged_values
+
+  before_validation -> { self.values = merged_values || values }
+
   def self.instance
     first || new
   end
 
   def values
-    merged_values = super
+    self.merged_values ||= super
     self.class.instance_methods(false).grep(/^load_values_from_[A-Z0-9_]*/).each do |method|
-      merged_values = merged_values.merge(public_send(method))
+      self.merged_values = self.merged_values.merge(public_send(method))
     end
     merged_values
   end