From d2ac8a30c09a3f5de89ac3ae7a2eb7f1619d75e6 Mon Sep 17 00:00:00 2001 From: alterpub Date: Mon, 12 May 2014 17:53:07 +0400 Subject: [PATCH] redesigned fix --- app/controllers/admin/users_controller.rb | 8 +------- app/models/user.rb | 2 ++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 06dec657..9492cdce 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -2,13 +2,7 @@ class Admin::UsersController < ApplicationController before_filter :verify_admin def index - @users = User.select('users.*, - 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') + @users = User.joins(:person).order('people.last_name ASC') end def update diff --git a/app/models/user.rb b/app/models/user.rb index d4a32cf7..1df5329a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -17,6 +17,8 @@ class User < ActiveRecord::Base before_save :setup_role before_create :create_person + delegate :last_name, :first_name, :public_name, :email, to: :person + def role?(role) Rails.logger.debug("Checking role in user") return !!self.roles.find_by_name(role.to_s.camelize)