rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-26 20:54:21 +01:00
Code Issues Releases Activity

bug fix canceled_at was called on slot in members/show.json.jbuilder

Browse Source
This commit is contained in:
Nicolas Florentin 2022-07-19 08:21:18 +02:00
parent e955ecc6f8
commit b3795e21ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/api/members/show.json.jbuilder
View File

@ -17,7 +17,7 @@ json.training_reservations @member.reservations.where(reservable_type: 'Training
json.reservable r.reservable json.reservable r.reservable
json.reservable_type 'Training' json.reservable_type 'Training'
json.is_valid @member.statistic_profile.training_ids.include?(r.reservable_id) json.is_valid @member.statistic_profile.training_ids.include?(r.reservable_id)
json.canceled_at r.slots.first.canceled_at json.canceled_at r.slots_reservations.first.canceled_at
end end
json.machine_reservations @member.reservations.where(reservable_type: 'Machine') do |r| json.machine_reservations @member.reservations.where(reservable_type: 'Machine') do |r|
json.id r.id json.id r.id
@ -25,7 +25,7 @@ json.machine_reservations @member.reservations.where(reservable_type: 'Machine')
json.end_at r.slots.first.end_at json.end_at r.slots.first.end_at
json.reservable r.reservable json.reservable r.reservable
json.reservable_type 'Machine' json.reservable_type 'Machine'
json.canceled_at r.slots.first.canceled_at json.canceled_at r.slots_reservations.first.canceled_at
end end
json.space_reservations @member.reservations.where(reservable_type: 'Space') do |r| json.space_reservations @member.reservations.where(reservable_type: 'Space') do |r|
json.id r.id json.id r.id
@ -33,7 +33,7 @@ json.space_reservations @member.reservations.where(reservable_type: 'Space') do
json.end_at r.slots.first.end_at json.end_at r.slots.first.end_at
json.reservable r.reservable json.reservable r.reservable
json.reservable_type 'Space' json.reservable_type 'Space'
json.canceled_at r.slots.first.canceled_at json.canceled_at r.slots_reservations.first.canceled_at
end end
json.all_projects @member.all_projects do |project| json.all_projects @member.all_projects do |project|