users_controller.rb in spina-0.12.0

- old
+ new

@@ -1,12 +1,11 @@
 module Spina
   module Admin
     class UsersController < AdminController
       before_action :set_breadcrumbs
+      before_action :authorize_admin, except: [:index]
 
-      authorize_resource class: User
-
       def index
         @users = User.all
       end
 
       def new
@@ -41,22 +40,22 @@
         end
       end
 
       def destroy
         @user = User.find(params[:id])
-        @user.destroy unless @user == current_user
+        @user.destroy unless @user == current_spina_user
         redirect_to admin_users_url
       end
 
       private
 
-      def set_breadcrumbs
-        add_breadcrumb I18n.t('spina.preferences.users'), spina.admin_users_path
-      end
+        def set_breadcrumbs
+          add_breadcrumb I18n.t('spina.preferences.users'), spina.admin_users_path
+        end
 
-      def user_params
-        params.require(:user).permit(:admin, :email, :name, :password_digest, :password, :password_confirmation, :last_logged_in)
-      end
+        def user_params
+          params.require(:user).permit(:admin, :email, :name, :password_digest, :password, :password_confirmation, :last_logged_in)
+        end
 
     end
   end
 end