diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 2bea1a1..2741498 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,21 +1,21 @@ class UsersController < ApplicationController - def index + def index @users = User.all - end - def add_role + end + def add_role @user= User.find(params[:id]) if (params[:role]=="fetuser" && can?(:addfetuser,User)) - @user.add_role(params[:role]) + @user.add_role(params[:role]) end if (params[:role]=="fetadmin" && can?(:addfetadmin,User)) - @user.add_role(params[:role]) + @user.add_role(params[:role]) end redirect_to users_url - end - def do_confirm + end + def do_confirm @user= User.find(params[:id]) @user.confirm! - + redirect_to users_url - end + end end