diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-19 12:04:34 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-19 15:29:53 +0200 |
commit | d059c69db76a5a55841bb8b0914211ae0a4bfd4f (patch) | |
tree | 0257a77f6955ae0e6f4c7887a4e9b3a62b57cd0a /app/controllers/admin/identities_controller.rb | |
parent | 270b7ce810775d69887e76162a00e8dc97e5d959 (diff) | |
download | gitlab-ce-d059c69db76a5a55841bb8b0914211ae0a4bfd4f.tar.gz |
Move identities list to own controller action
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/admin/identities_controller.rb')
-rw-r--r-- | app/controllers/admin/identities_controller.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb index 795fecd78d6..17ace5a258b 100644 --- a/app/controllers/admin/identities_controller.rb +++ b/app/controllers/admin/identities_controller.rb @@ -1,13 +1,17 @@ class Admin::IdentitiesController < Admin::ApplicationController before_action :user - before_action :identity + before_action :identity, except: :index + + def index + @identities = @user.identities + end def edit end def update if @identity.update_attributes(identity_params) - redirect_to admin_user_path(@user), notice: 'User identity was successfully updated.' + redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully updated.' else render :edit end @@ -16,9 +20,9 @@ class Admin::IdentitiesController < Admin::ApplicationController def destroy respond_to do |format| if @identity.destroy - format.html { redirect_to [:admin, user], notice: 'User identity was successfully removed.' } + format.html { redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully removed.' } else - format.html { redirect_to [:admin, user], alert: 'Failed to remove user identity.' } + format.html { redirect_to admin_user_identities_path(@user), alert: 'Failed to remove user identity.' } end end end |