From 0eb82bb11f3090d98734c0294ee9bb45bd95b99b Mon Sep 17 00:00:00 2001 From: alterpub Date: Mon, 5 May 2014 02:28:46 +0400 Subject: [PATCH 1/5] Fixed /admin/users ArgumentError in Admin::UsersController#index wrong number of arguments (1 for 0) Rails 4 has depricated "all" method, now it's default behaviour --- app/controllers/admin/users_controller.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 177c4566..765f4bdc 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -2,14 +2,13 @@ class Admin::UsersController < ApplicationController before_filter :verify_admin def index - @users = User.all(:joins => :person, - :order => "people.last_name ASC", - :select => "users.*, + @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") - end + people.email AS email").joins(:person).load.order("people.last_name ASC") + + end def update user = User.find(params[:id]) @@ -28,4 +27,4 @@ class Admin::UsersController < ApplicationController end -end \ No newline at end of file +end From 7c5767569341be20c2d4035d5e08efded7f1f5f9 Mon Sep 17 00:00:00 2001 From: alter Date: Mon, 5 May 2014 02:44:08 +0400 Subject: [PATCH 2/5] Update users_controller.rb --- app/controllers/admin/users_controller.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 765f4bdc..b541ec1d 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -2,13 +2,13 @@ class Admin::UsersController < ApplicationController before_filter :verify_admin def index - @users = User.select("users.*, + @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") - - end + people.email AS email'). + joins(:person).load.order('people.last_name ASC') + end def update user = User.find(params[:id]) From 42d65aef23212743698dd3fcf5b4e72715732fe5 Mon Sep 17 00:00:00 2001 From: alter Date: Mon, 5 May 2014 02:49:35 +0400 Subject: [PATCH 3/5] Update users_controller.rb --- app/controllers/admin/users_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index b541ec1d..06dec657 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -7,7 +7,8 @@ class Admin::UsersController < ApplicationController people.first_name AS first_name, people.public_name AS public_name, people.email AS email'). - joins(:person).load.order('people.last_name ASC') + joins(:person).load. + order('people.last_name ASC') end def update From d2ac8a30c09a3f5de89ac3ae7a2eb7f1619d75e6 Mon Sep 17 00:00:00 2001 From: alterpub Date: Mon, 12 May 2014 17:53:07 +0400 Subject: [PATCH 4/5] 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) From 645d525bdde7f65946bf1f003f5a81028b3e7b31 Mon Sep 17 00:00:00 2001 From: alterpub Date: Mon, 12 May 2014 18:22:41 +0400 Subject: [PATCH 5/5] removed :email field from delegate --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 1df5329a..ee6ef34f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -17,7 +17,7 @@ class User < ActiveRecord::Base before_save :setup_role before_create :create_person - delegate :last_name, :first_name, :public_name, :email, to: :person + delegate :last_name, :first_name, :public_name, to: :person def role?(role) Rails.logger.debug("Checking role in user")