seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

vrfs-768: added check for user_admin_eq in scoped_collection

This commit is contained in:
Jonathan Kolyer 2013-10-10 14:42:40 -05:00
parent daaf1ca01f
commit 712e748218
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/app/admin/music_session_history.rb
View File

@ -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