app/controllers/casein/admin_users_controller.rb in casein-5.1.1.5 vs app/controllers/casein/admin_users_controller.rb in casein-5.2.0.0

@@ -1,16 +1,16 @@
 require 'securerandom'
 
 module Casein
   class AdminUsersController < Casein::CaseinController
 
-    before_filter :needs_admin, :except => [:show, :destroy, :update, :update_password]
-    before_filter :needs_admin_or_current_user, :only => [:show, :destroy, :update, :update_password]
+    before_action :needs_admin, except: [:show, :destroy, :update, :update_password]
+    before_action :needs_admin_or_current_user, only: [:show, :destroy, :update, :update_password]
  
     def index
       @casein_page_title = "Users"
-      @users = Casein::AdminUser.order(sort_order(:login)).paginate :page => params[:page]
+      @users = Casein::AdminUser.order(sort_order(:login)).paginate page: params[:page]
     end
  
     def new
       @casein_page_title = "Add a new user"
     	@casein_admin_user = Casein::AdminUser.new
@@ -26,11 +26,11 @@
       if @casein_admin_user.save
         flash[:notice] = "An email has been sent to " + @casein_admin_user.name + " with the new account details"
         redirect_to casein_admin_users_path
       else
         flash.now[:warning] = "There were problems when trying to create a new user"
-        render :action => :new
+        render action: :new
       end
     end
   
     def show
     	@casein_admin_user = Casein::AdminUser.find params[:id]
@@ -43,18 +43,18 @@
 
       if @casein_admin_user.update_attributes casein_admin_user_params
         flash[:notice] = @casein_admin_user.name + " has been updated"
       else
         flash.now[:warning] = "There were problems when trying to update this user"
-        render :action => :show
+        render action: :show
         return
       end
       
       if @session_user.is_admin?
         redirect_to casein_admin_users_path
       else
-        redirect_to :controller => :casein, :action => :index
+        redirect_to controller: :casein, action: :index
       end
     end
  
     def update_password
       @casein_admin_user = Casein::AdminUser.find params[:id]
@@ -70,11 +70,11 @@
         end
       else
         flash[:warning] = "The current password is incorrect"
       end
       
-      redirect_to :action => :show
+      redirect_to action: :show
     end
  
     def reset_password
       @casein_admin_user = Casein::AdminUser.find params[:id]
       @casein_page_title = @casein_admin_user.name + " > Reset password"
@@ -94,11 +94,11 @@
         else
           flash[:warning] = "There were problems when trying to reset this user's password"
         end
       end
 
-      redirect_to :action => :show
+      redirect_to action: :show
     end
  
     def destroy
       user = Casein::AdminUser.find params[:id]
       if user.is_admin? == false || Casein::AdminUser.has_more_than_one_admin
@@ -111,10 +111,10 @@
     private
 
       def generate_random_password
         random_password = random_string = SecureRandom.hex
         params[:casein_admin_user] = Hash.new if params[:casein_admin_user].blank?
-        params[:casein_admin_user].merge! ({:password => random_password, :password_confirmation => random_password})
+        params[:casein_admin_user].merge! ({ password: random_password, password_confirmation: random_password })
       end
 
       def casein_admin_user_params
         params.require(:casein_admin_user).permit(:login, :name, :email, :time_zone, :access_level, :password, :password_confirmation)
       end
\ No newline at end of file