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

[fix]Remove duplicate code

Browse source
This commit is contained in:
Jimmy 2021-04-22 01:24:14 +08:00 • committed by CactusPuppy
parent 375f53cdf6
commit a2d775e36d
No known key found for this signature in database
GPG key ID: 4B33B0A3E15E2C82
3 changed files with 12 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/conferences_controller.rb
View file

@ -147,16 +147,4 @@ class ConferencesController < ApplicationController
def current_user_has_unpaid_tickets? def current_user_has_unpaid_tickets?
current_user && current_user_tickets.unpaid.any? current_user && current_user_tickets.unpaid.any?
end 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 end

12
app/controllers/proposals_controller.rb
View file

@ -183,16 +183,4 @@ class ProposalsController < ApplicationController
def user_params def user_params
params.require(:user).permit(:email, :password, :password_confirmation, :username) params.require(:user).permit(:email, :password, :password_confirmation, :username)
end 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 end

12
app/helpers/conference_helper.rb
View file

@ -98,6 +98,18 @@ module ConferenceHelper
events_schedules events_schedules
end 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 private
def filter_events_schedules(conference, filter) def filter_events_schedules(conference, filter)