diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-12-09 13:28:09 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-12-09 16:08:04 +0100 |
commit | e7f1bfdc2d528f137299ba0c3ab2a30f2f91f53c (patch) | |
tree | 2693ffce4d340a9b77a7ca52c856aaae7af8c913 /app/lib/user_settings_decorator.rb | |
parent | e3682c9c1750e5e7e5d2f817e29f6760a18400ca (diff) | |
parent | 81bda7d67c984c9bfcb5bca94e50cec6405b492e (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
Diffstat (limited to 'app/lib/user_settings_decorator.rb')
-rw-r--r-- | app/lib/user_settings_decorator.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb index e5b168502..559e00d20 100644 --- a/app/lib/user_settings_decorator.rb +++ b/app/lib/user_settings_decorator.rb @@ -33,6 +33,7 @@ class UserSettingsDecorator user.settings['flavour'] = flavour_preference if change?('setting_flavour') user.settings['skin'] = skin_preference if change?('setting_skin') user.settings['hide_network'] = hide_network_preference if change?('setting_hide_network') + user.settings['aggregate_reblogs'] = aggregate_reblogs_preference if change?('setting_aggregate_reblogs') end def merged_notification_emails @@ -107,6 +108,10 @@ class UserSettingsDecorator settings['setting_default_language'] end + def aggregate_reblogs_preference + boolean_cast_setting 'setting_aggregate_reblogs' + end + def boolean_cast_setting(key) ActiveModel::Type::Boolean.new.cast(settings[key]) end |