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

Some tests for users controller, and fixed users#index

Browse source
This commit is contained in:
Gopesh Tulsyan 2014-05-12 14:19:46 +05:30
parent adfa9cc871
commit 4955481f14
9 changed files with 84 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,7 @@ class Admin::UsersController < ApplicationController
before_filter :verify_admin
def index
@users = User.all(:joins => :person,
:order => "people.last_name ASC",
:select => "users.*,
@users = User.joins(:person).order("people.last_name ASC").select("users.*,
people.last_name AS last_name,
people.first_name AS first_name,
people.public_name AS public_name,