rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Code Issues Releases Activity

(bug) ics description not using new methdod

Browse Source
This commit is contained in:
Sylvain 2022-07-27 13:58:22 +02:00
parent 677b796d32
commit 3f84c2dfa1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/concerns/i_calendar_concern.rb
View File

@ -25,7 +25,7 @@ module ICalendarConcern
e.dtstart = start_time
e.dtend = group_slots.last[:end_at]
e.summary = title
e.description = I18n.t('reservation_ics.description_slot', COUNT: group_slots.count, ITEM: reservable.name)
e.description = description(group_slots)
e.ip_class = 'PRIVATE'
e.alarm do |a|
@ -60,7 +60,7 @@ module ICalendarConcern
when 'Training'
I18n.t('reservation_ics.description_training', TYPE: reservable.name)
when 'Event'
I18n.t('reservation_ics.description_event', NUMBER: nb_reserve_places + tickets.map(&:booked).reduce(:+))
I18n.t('reservation_ics.description_event', NUMBER: nb_reserve_places + (tickets.map(&:booked).reduce(:+) || 0))
else
Rails.logger.warn "Unexpected reservable type #{reservable_type}"
I18n.t('reservation_ics.description_slot', COUNT: group_slots.count, ITEM: reservable_type)

2
app/services/members/list_service.rb
View File

@ -42,7 +42,7 @@ class Members::ListService
end
def search(current_user, query, subscription, include_admins = 'false')
members = User.includes(:profile)
members = User.includes(:profile, :statistic_profile)
.joins(:profile,
:statistic_profile,
:roles,