about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2020-02-18 02:43:47 -0600
committermultiple creatures <dev@multiple-creature.party>2020-02-18 02:43:47 -0600
commite4633a1150450396157640f5262393bb52db280b (patch)
tree4d5666c64f9e502b84700983275553c1d9030428 /app/views
parent0f3b01eaab82325baaf1c7a4c75a322d3c21a67f (diff)
move defang toggle to preferences instead of profile
Diffstat (limited to 'app/views')
-rw-r--r--app/views/settings/preferences/show.html.haml6
-rw-r--r--app/views/settings/profiles/show.html.haml6
2 files changed, 6 insertions, 6 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 4d4941a2e..c51f91bde 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -11,6 +11,12 @@
 = simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
   = render 'shared/error_messages', object: current_user
 
+  - if current_user.can_moderate?
+    %hr/
+
+    .fields-group
+      = f.input :defanged, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.defanged')
+
   %hr#settings_publishing/
 
   .fields-group
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index ba2fd7495..4fabfb9f4 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -18,12 +18,6 @@
 
       = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar', dimensions: '400x400', size: number_to_human_size(AccountAvatar::LIMIT))
 
-  - if @account.user_can_moderate?
-    %hr.spacer/
-
-    .fields-group
-      = f.input :user_defanged, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.user_defanged')
-
   %hr.spacer/
 
   .fields-group