From 0324382024610fe4cce59c34828c492ebf272a60 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Thu, 19 Oct 2017 16:06:50 +0300 Subject: [PATCH] Filtering by confirmation status --- app/models/event_search.rb | 2 ++ app/views/management/conferences/show.html.slim | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/event_search.rb b/app/models/event_search.rb index decb861..7912e4d 100644 --- a/app/models/event_search.rb +++ b/app/models/event_search.rb @@ -6,6 +6,8 @@ class EventSearch option(:track_id) { |scope, value| scope.where track_id: value } option(:event_type_id) { |scope, value| scope.where event_type_id: value } option(:status) { |scope, value| scope.joins(:proposition).where(propositions: {status: value}) } + option(:confirmed) { |scope, value| scope.joins(:proposition).where(status: :approved).where.not(confirmed_at: nil) } + option(:not_confirmed) { |scope, value| scope.joins(:proposition).where(status: :approved, confirmed_at: nil) } sort_by 'title' config[:defaults]['sort'] = "#{config[:sort_attributes].first} asc" diff --git a/app/views/management/conferences/show.html.slim b/app/views/management/conferences/show.html.slim index 84f3951..c3064de 100644 --- a/app/views/management/conferences/show.html.slim +++ b/app/views/management/conferences/show.html.slim @@ -81,7 +81,7 @@ = @conference.events.joins(:proposition).approved.confirmed.count div = t 'event_states.confirmed', count: @conference.events.joins(:proposition).approved.confirmed.count - = link_to '#' + = link_to management_conference_events_path(@conference, filters: {confirmed: true}) .panel-footer.text-success span.pull-left = t 'views.conference.see_details' span.pull-right = icon 'arrow-circle-right'