From a2d775e36d8c36e09a554aae2c699bc144d75fa9 Mon Sep 17 00:00:00 2001 From: Jimmy Date: Thu, 22 Apr 2021 01:24:14 +0800 Subject: [PATCH] [fix]Remove duplicate code --- app/controllers/conferences_controller.rb | 12 ------------ app/controllers/proposals_controller.rb | 12 ------------ app/helpers/conference_helper.rb | 12 ++++++++++++ 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/app/controllers/conferences_controller.rb b/app/controllers/conferences_controller.rb index 529d9fb4..cfd7eafc 100644 --- a/app/controllers/conferences_controller.rb +++ b/app/controllers/conferences_controller.rb @@ -147,16 +147,4 @@ class ConferencesController < ApplicationController def current_user_has_unpaid_tickets? current_user && current_user_tickets.unpaid.any? end - - def load_happening_now - events_schedules_list = get_happening_now_events_schedules(@conference) - @is_happening_next = false - if events_schedules_list.empty? - events_schedules_list = get_happening_next_events_schedules(@conference) - @is_happening_next = true - end - @events_schedules_limit = EVENTS_PER_PAGE - @events_schedules_length = events_schedules_list.length - @pagy, @events_schedules = pagy_array(events_schedules_list, items: @events_schedules_limit, link_extra: 'data-remote="true"') - end end diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index a9aef1d8..92625ea9 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -183,16 +183,4 @@ class ProposalsController < ApplicationController def user_params params.require(:user).permit(:email, :password, :password_confirmation, :username) end - - def load_happening_now - events_schedules_list = get_happening_now_events_schedules(@conference) - @is_happening_next = false - if events_schedules_list.empty? - events_schedules_list = get_happening_next_events_schedules(@conference) - @is_happening_next = true - end - @events_schedules_limit = EVENTS_PER_PAGE - @events_schedules_length = events_schedules_list.length - @pagy, @events_schedules = pagy_array(events_schedules_list, items: @events_schedules_limit, link_extra: 'data-remote="true"') - end end diff --git a/app/helpers/conference_helper.rb b/app/helpers/conference_helper.rb index 29db24d4..4240ad54 100644 --- a/app/helpers/conference_helper.rb +++ b/app/helpers/conference_helper.rb @@ -98,6 +98,18 @@ module ConferenceHelper events_schedules end + def load_happening_now + events_schedules_list = get_happening_now_events_schedules(@conference) + @is_happening_next = false + if events_schedules_list.empty? + events_schedules_list = get_happening_next_events_schedules(@conference) + @is_happening_next = true + end + @events_schedules_limit = EVENTS_PER_PAGE + @events_schedules_length = events_schedules_list.length + @pagy, @events_schedules = pagy_array(events_schedules_list, items: @events_schedules_limit, link_extra: 'data-remote="true"') + end + private def filter_events_schedules(conference, filter)