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

Merge pull request #95 from alter/master

Browse source 
Fixed /admin/users
This commit is contained in:
Artem Chernikov 2014-05-12 17:20:21 +02:00
commit 9090cc0d38
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

2
app/models/user.rb
View file

@ -17,6 +17,8 @@ class User < ActiveRecord::Base
before_save :setup_role before_save :setup_role
before_create :create_person before_create :create_person
delegate :last_name, :first_name, :public_name, to: :person
def role?(role) def role?(role)
Rails.logger.debug("Checking role in user") Rails.logger.debug("Checking role in user")
return !!self.roles.find_by_name(role.to_s.camelize) return !!self.roles.find_by_name(role.to_s.camelize)