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

upgrade datatables gem

Browse source
This commit is contained in:
Michael Ball 2020-07-13 02:58:15 -07:00
parent 18ee10eef5
commit cd88882714
7 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/admin/reports_controller.rb
View file

@ -8,7 +8,8 @@ module Admin
# load_and_authorize_resource :event, through: :program
def index
@events = Event.accessible_by(current_ability).where(program: @program)
@events = Event.accessible_by(current_ability).where(program: @program,
state: [:confirmed, :unconfirmed])
@events_commercials = Commercial.where(commercialable_type: 'Event', commercialable_id: @events.pluck(:id))
@events_missing_commercial = @events.where.not(id: @events_commercials.pluck(:commercialable_id))
@events_with_requirements = @events.where.not(description: ['', nil])