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

redesigned fix

Browse source
This commit is contained in:
alterpub 2014-05-12 17:53:07 +04:00
parent 42d65aef23
commit d2ac8a30c0
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
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.select('users.*, @users = User.joins(:person).order('people.last_name ASC')
people.last_name AS last_name,
people.first_name AS first_name,
people.public_name AS public_name,
people.email AS email').
joins(:person).load.
order('people.last_name ASC')
end end
def update def update

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, :email, 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)