gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed /admin/users

Browse source 
ArgumentError in Admin::UsersController#index
wrong number of arguments (1 for 0)

Rails 4 has depricated "all" method, now it's default behaviour
This commit is contained in:
alterpub 2014-05-05 02:28:46 +04:00
parent 4e395a0d7a
commit 0eb82bb11f
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/admin/users_controller.rb
View file

@ -2,14 +2,13 @@ class Admin::UsersController < ApplicationController
before_filter :verify_admin before_filter :verify_admin
def index def index
@users = User.all(:joins => :person, @users = User.select("users.*,
:order => "people.last_name ASC",
:select => "users.*,
people.last_name AS last_name, people.last_name AS last_name,
people.first_name AS first_name, people.first_name AS first_name,
people.public_name AS public_name, people.public_name AS public_name,
people.email AS email") people.email AS email").joins(:person).load.order("people.last_name ASC")
end
end
def update def update
user = User.find(params[:id]) user = User.find(params[:id])
@ -28,4 +27,4 @@ class Admin::UsersController < ApplicationController
end end
end end