users_controller.rb in spina-1.1.0

- old
+ new

@@ -1,10 +1,11 @@
 module Spina
   module Admin
     class UsersController < AdminController
       before_action :set_breadcrumbs
       before_action :authorize_admin, except: [:index]
+      before_action :set_user, only: [:edit, :update, :destroy]
 
       def index
         @users = User.all
       end
 
@@ -22,28 +23,25 @@
           flash.now[:alert] = I18n.t('spina.users.cannot_be_created')
           render :new
         end
       end
 
-      def edit
-        @user = User.find(params[:id])
+      def edit        
         add_breadcrumb "#{@user}"
       end
 
-      def update
-        @user = User.find(params[:id])
+      def update        
         add_breadcrumb "#{@user}"
-        if @user.update_attributes(user_params)
+        if @user.update(user_params)
           redirect_to spina.admin_users_url
         else
           flash.now[:alert] = I18n.t('spina.users.cannot_be_created')
           render :edit
         end
       end
 
-      def destroy
-        @user = User.find(params[:id])
+      def destroy        
         @user.destroy unless @user == current_spina_user
         redirect_to admin_users_url
       end
 
       private
@@ -54,8 +52,11 @@
 
         def user_params
           params.require(:user).permit(:admin, :email, :name, :password_digest, :password, :password_confirmation, :last_logged_in)
         end
 
+        def set_user
+          @user = User.find(params[:id])
+        end
     end
   end
 end