diff options
| author | Atsushi Yamamoto <yamaatsushi927@gmail.com> | 2017-05-29 11:56:13 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-29 17:56:13 +0200 |
| commit | 402c19a92475014e04df91eca759225f8a89d2ac (patch) | |
| tree | 76262cf99e34295d2e9acae0ab7858ff2fdc2796 /app/views | |
| parent | b5e89948441eb245a873260a87bfb49fb334aee1 (diff) | |
Add preference setting for delete toot modal (#3368)
* Set delete_modal preference to true by default * Does not show confirmation modal if delete_modal is false * Add ja translation for preference setting page
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/home/initial_state.json.rabl | 1 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/home/initial_state.json.rabl b/app/views/home/initial_state.json.rabl index ac0bee2e2..e305f8e7a 100644 --- a/app/views/home/initial_state.json.rabl +++ b/app/views/home/initial_state.json.rabl @@ -9,6 +9,7 @@ node(:meta) do me: current_account.id, admin: @admin.try(:id), boost_modal: current_account.user.setting_boost_modal, + delete_modal: current_account.user.setting_delete_modal, auto_play_gif: current_account.user.setting_auto_play_gif, } end diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 3771698d1..721ce6a21 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -40,6 +40,7 @@ .fields-group = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label + = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label .fields-group = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label |