about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorMatt Jankowski <mjankowski@thoughtbot.com>2017-04-15 10:44:59 -0400
committerEugen <eugen@zeonfederated.com>2017-04-15 16:44:59 +0200
commit6670e6d33fa735b6199e3b962f62ed6d1442bae1 (patch)
treecdd5aefe392f73cd456e2bf376645eea0f4a8754 /app
parent9d2f55ecc3cc6bef9dc79ad8faf444261736976b (diff)
Add password reset for users from admin accounts area (#1841)
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin/resets_controller.rb18
-rw-r--r--app/views/admin/accounts/show.html.haml20
2 files changed, 30 insertions, 8 deletions
diff --git a/app/controllers/admin/resets_controller.rb b/app/controllers/admin/resets_controller.rb
new file mode 100644
index 000000000..6db648403
--- /dev/null
+++ b/app/controllers/admin/resets_controller.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Admin
+  class ResetsController < BaseController
+    before_action :set_account
+
+    def create
+      @account.user.send_reset_password_instructions
+      redirect_to admin_accounts_path
+    end
+
+    private
+
+    def set_account
+      @account = Account.find(params[:account_id])
+    end
+  end
+end
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index 6d2a4d123..07dcc7f46 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -61,12 +61,16 @@
         = surround '(', ')' do
           = number_to_human_size @account.media_attachments.sum('file_file_size')
 
-- if @account.silenced?
-  = link_to t('admin.accounts.undo_silenced'), admin_account_silence_path(@account.id), method: :delete, class: 'button'
-- else
-  = link_to t('admin.accounts.silence'), admin_account_silence_path(@account.id), method: :post, class: 'button'
+%div{ style: 'float: right' }
+  = link_to t('admin.accounts.reset_password'), admin_account_reset_path(@account.id), method: :create, class: 'button'
 
-- if @account.suspended?
-  = link_to t('admin.accounts.undo_suspension'), admin_account_suspension_path(@account.id), method: :delete, class: 'button'
-- else
-  = link_to t('admin.accounts.perform_full_suspension'), admin_account_suspension_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button'
+%div{ style: 'float: left' }
+  - if @account.silenced?
+    = link_to t('admin.accounts.undo_silenced'), admin_account_silence_path(@account.id), method: :delete, class: 'button'
+  - else
+    = link_to t('admin.accounts.silence'), admin_account_silence_path(@account.id), method: :post, class: 'button'
+
+  - if @account.suspended?
+    = link_to t('admin.accounts.undo_suspension'), admin_account_suspension_path(@account.id), method: :delete, class: 'button'
+  - else
+    = link_to t('admin.accounts.perform_full_suspension'), admin_account_suspension_path(@account.id), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }, class: 'button'