Add option for admin to remove users secondary emails.
This commit is contained in:
parent
73c1030da1
commit
37425618bc
|
@ -100,6 +100,16 @@ class Admin::UsersController < Admin::ApplicationController
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def remove_email
|
||||||
|
email = user.emails.find(params[:email_id])
|
||||||
|
email.destroy
|
||||||
|
|
||||||
|
respond_to do |format|
|
||||||
|
format.html { redirect_to :back, notice: "Successfully removed email." }
|
||||||
|
format.js { render nothing: true }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def user
|
def user
|
||||||
|
|
|
@ -44,6 +44,8 @@
|
||||||
%li
|
%li
|
||||||
%span.light Secondary email:
|
%span.light Secondary email:
|
||||||
%strong= email.email
|
%strong= email.email
|
||||||
|
= link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-tiny btn btn-remove pull-right", title: 'Remove secondary email' do
|
||||||
|
%i.icon-remove
|
||||||
|
|
||||||
%li
|
%li
|
||||||
%span.light Can create groups:
|
%span.light Can create groups:
|
||||||
|
|
|
@ -68,6 +68,7 @@ Gitlab::Application.routes.draw do
|
||||||
put :team_update
|
put :team_update
|
||||||
put :block
|
put :block
|
||||||
put :unblock
|
put :unblock
|
||||||
|
delete 'remove/:email_id', action: 'remove_email', as: 'remove_email'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue