Skip to content

O
OHR Support
Commit 8698b409 authored by Eric Davis's avatar Eric Davis
Browse files
Options

Merge branch 'ticket/release-v2.0.0/350-remove-freeze-from-settings' into release-v2.0.0

parents 9f2c412f f47821db
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
app/models/setting.rb
View file @ 8698b409
......@@ -96,7 +96,7 @@ class Setting < ActiveRecord::Base
# Returns the value of the setting named name
def self.[](name)
Marshal.load(Rails.cache.fetch("chiliproject/setting/#{name}") {Marshal.dump(find_or_default(name).value)}).freeze
Marshal.load(Rails.cache.fetch("chiliproject/setting/#{name}") {Marshal.dump(find_or_default(name).value)})
end
def self.[]=(name, v)
......@@ -104,7 +104,7 @@ class Setting < ActiveRecord::Base
setting.value = (v ? v : "")
Rails.cache.delete "chiliproject/setting/#{name}"
setting.save
setting.value.freeze
setting.value
end
# Defines getter and setter for each setting
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment