Change: #52 購読拒否設定項目を追加設定画面に移動 (#112)

kmycode · Oct 13, 2023 · 902888f · 902888f
1 parent f5bd91e
commit 902888f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/app/controllers/settings/privacy_controller.rb b/app/controllers/settings/privacy_controller.rb
@@ -18,7 +18,7 @@ def update
   private
 
   def account_params
-    params.require(:account).permit(:discoverable, :unlocked, :indexable, :show_collections, :dissubscribable, settings: UserSettings.keys)
+    params.require(:account).permit(:discoverable, :unlocked, :indexable, :show_collections, settings: UserSettings.keys)
   end
 
   def set_account

diff --git a/app/controllers/settings/privacy_extra_controller.rb b/app/controllers/settings/privacy_extra_controller.rb
@@ -18,7 +18,7 @@ def update
   private
 
   def account_params
-    params.require(:account).permit(settings: UserSettings.keys)
+    params.require(:account).permit(:dissubscribable, settings: UserSettings.keys)
   end
 
   def set_account

diff --git a/app/views/settings/privacy/show.html.haml b/app/views/settings/privacy/show.html.haml
@@ -24,9 +24,6 @@
     .fields-group
       = ff.input :noai, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_noai'), hint: I18n.t('simple_form.hints.defaults.setting_noai')
 
-  .fields-group
-    = f.input :dissubscribable, as: :boolean, wrapper: :with_label, kmyblue: true, hint: t('simple_form.hints.defaults.dissubscribable')
-
   .fields-group
     = f.input :unlocked, as: :boolean, wrapper: :with_label
 

diff --git a/app/views/settings/privacy_extra/show.html.haml b/app/views/settings/privacy_extra/show.html.haml
@@ -21,6 +21,12 @@
     .fields-group
       = ff.input :link_preview, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_link_preview'), hint: I18n.t('simple_form.hints.defaults.setting_link_preview')
 
+    .fields-group
+      = f.input :dissubscribable, as: :boolean, wrapper: :with_label, kmyblue: true, hint: t('simple_form.hints.defaults.dissubscribable')
+
+    .fields-group
+      = ff.input :allow_quote, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_allow_quote'), hint: false
+
   %h4= t 'privacy_extra.stop_deliver'
 
   %p.lead= t('privacy_extra.stop_deliver_hint_html')