diff options
author | ThibG <thib@sitedethib.com> | 2019-07-17 16:56:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-17 16:56:10 +0200 |
commit | e9cc17bbeab1f1d47b5a919adb0ae7eae4eee791 (patch) | |
tree | 21f25d570ea6f57d58c24eec6e65aab8b96f816b /app/lib/user_settings_decorator.rb | |
parent | 5ccd011cc3bafc00a557dabbb47da004f3d4a381 (diff) | |
parent | e91bf82083ac390a0cf229d8e94fa412fdec57ff (diff) |
Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream
Cherry-pick changes from upstream
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 ac35fd005..51d8c0970 100644 --- a/app/lib/user_settings_decorator.rb +++ b/app/lib/user_settings_decorator.rb @@ -39,6 +39,7 @@ class UserSettingsDecorator user.settings['advanced_layout'] = advanced_layout_preference if change?('setting_advanced_layout') user.settings['default_content_type']= default_content_type_preference if change?('setting_default_content_type') user.settings['use_blurhash'] = use_blurhash_preference if change?('setting_use_blurhash') + user.settings['use_pending_items'] = use_pending_items_preference if change?('setting_use_pending_items') end def merged_notification_emails @@ -137,6 +138,10 @@ class UserSettingsDecorator boolean_cast_setting 'setting_use_blurhash' end + def use_pending_items_preference + boolean_cast_setting 'setting_use_pending_items' + end + def boolean_cast_setting(key) ActiveModel::Type::Boolean.new.cast(settings[key]) end |