diff options
author | David Yip <yipdw@member.fsf.org> | 2018-05-18 07:53:04 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-05-18 08:47:10 -0500 |
commit | e0eebba46192e5ef2050347069c4098d33e9ec54 (patch) | |
tree | e58d15f7bd6d5c5f5ce53d880a7ad89bf3faaab2 /app/lib/user_settings_decorator.rb | |
parent | 4c0770d6c8dac8177b8891a6fb97ccf440100fc2 (diff) | |
parent | 57b503d4ef0754e4651eae26b628cba60e1ab4e9 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml
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 78b3aa77c..f8bacb036 100644 --- a/app/lib/user_settings_decorator.rb +++ b/app/lib/user_settings_decorator.rb @@ -30,6 +30,7 @@ class UserSettingsDecorator user.settings['noindex'] = noindex_preference if change?('setting_noindex') 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') end def merged_notification_emails @@ -92,6 +93,10 @@ class UserSettingsDecorator settings['setting_skin'] end + def hide_network_preference + boolean_cast_setting 'setting_hide_network' + end + def boolean_cast_setting(key) ActiveModel::Type::Boolean.new.cast(settings[key]) end |