app/controllers/chaltron/users_controller.rb in chaltron-0.1.4 vs app/controllers/chaltron/users_controller.rb in chaltron-0.1.5

@@ -4,12 +4,11 @@
 
   respond_to :html
   default_log_category :user_admin
 
   def index
-    @filters = params[:filters] || {}
-
+    @filters = filter_params
     # apply provider filter
     @users = @users.where(provider: nil) if @filters[:provider] == 'local'
     @users = @users.where(provider: :ldap) if @filters[:provider] == 'ldap'
     # apply activity filter
     @users = @users.where(sign_in_count: 0) if @filters[:activity] == 'no_login'
@@ -43,11 +42,11 @@
     flash[:notice] = I18n.t('chaltron.users.updated') if @user.update(update_params)
     respond_with(@user)
   end
 
   def self_update
-    user_params_with_pass = self_update_params.dup
+    user_params_with_pass = self_update_params.dup.to_h
     if params[:user][:password].present?
       user_params_with_pass.merge!(
         password: params[:user][:password],
         password_confirmation: params[:user][:password_confirmation],
       )
@@ -83,6 +82,9 @@
 
   def self_update_params
     params.require(:user).permit(:email, :fullname)
   end
 
+  def filter_params
+    params.fetch(:filters, {}).permit(:provider, :activity)
+  end
 end