gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-16 05:04:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #114 from gopesht/testing

Browse source 
some basic tests and fixed bug to display users
This commit is contained in:
James Mason 2014-06-03 07:53:23 -07:00
commit 642cb06dc2
7 changed files with 64 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,11 @@ class Admin::UsersController < ApplicationController
before_filter :verify_admin
def index
@users = User.joins(:person).order('people.last_name ASC')
@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,
people.email AS email")
end
def update