From 712e7482187bb2641aa8d8e6c17c87680f29728b Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Thu, 10 Oct 2013 14:42:40 -0500 Subject: [PATCH] vrfs-768: added check for user_admin_eq in scoped_collection --- admin/app/admin/music_session_history.rb | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/admin/app/admin/music_session_history.rb b/admin/app/admin/music_session_history.rb index 4b32e74ae..81b56bd03 100644 --- a/admin/app/admin/music_session_history.rb +++ b/admin/app/admin/music_session_history.rb @@ -6,9 +6,17 @@ ActiveAdmin.register JamRuby::MusicSessionHistory, :as => 'Music Session History controller do def scoped_collection - @music_session_histories ||= end_of_association_chain - .includes([:user, :band]) - .order('created_at DESC') + if '1' == params['user_admin_eq'] + @music_session_histories ||= end_of_association_chain + .includes([:user, :band]) + .order('created_at DESC') + else + @music_session_histories ||= end_of_association_chain + .joins('INNER JOIN users AS uu ON uu.id = music_sessions_history.user_id') + .where(['uu.admin = ?','f']) + .includes([:user, :band]) + .order('created_at DESC') + end end end