diff options
| author | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-25 16:24:22 +0200 |
|---|---|---|
| committer | Alexis Reigel <mail@koffeinfrei.org> | 2017-07-27 15:46:03 +0200 |
| commit | ecbc11a839f7a48402e912f1176735770c091829 (patch) | |
| tree | 79ecc225940d1d327c9591afd51fec0c4a1b685d /app/controllers/profiles | |
| parent | 98531fc2487f8d4d7de47fe9a1d60c10d1f1d9ba (diff) | |
| download | gitlab-ce-ecbc11a839f7a48402e912f1176735770c091829.tar.gz | |
extract setter as before_action
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/gpg_keys_controller.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/controllers/profiles/gpg_keys_controller.rb b/app/controllers/profiles/gpg_keys_controller.rb index 3e75247769d..6779cc6ddac 100644 --- a/app/controllers/profiles/gpg_keys_controller.rb +++ b/app/controllers/profiles/gpg_keys_controller.rb @@ -1,4 +1,6 @@ class Profiles::GpgKeysController < Profiles::ApplicationController + before_action :set_gpg_key, only: [:destroy, :revoke] + def index @gpg_keys = current_user.gpg_keys @gpg_key = GpgKey.new @@ -16,8 +18,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController end def destroy - @gpp_key = current_user.gpg_keys.find(params[:id]) - @gpp_key.destroy + @gpg_key.destroy respond_to do |format| format.html { redirect_to profile_gpg_keys_url, status: 302 } @@ -26,8 +27,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController end def revoke - @gpp_key = current_user.gpg_keys.find(params[:id]) - @gpp_key.revoke + @gpg_key.revoke respond_to do |format| format.html { redirect_to profile_gpg_keys_url, status: 302 } @@ -40,4 +40,8 @@ class Profiles::GpgKeysController < Profiles::ApplicationController def gpg_key_params params.require(:gpg_key).permit(:key) end + + def set_gpg_key + @gpg_key = current_user.gpg_keys.find(params[:id]) + end end |