rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

[bug] unable to display profiles of users whom any reservation is associated with a deleted object

Browse Source
This commit is contained in:
Sylvain 2017-11-13 11:15:33 +01:00
parent 497ad71591
commit 639610dc7a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -16,6 +16,7 @@
- Fix a bug: event, space, training or machine main image on description page is deformed on small devices - Fix a bug: event, space, training or machine main image on description page is deformed on small devices
- Fix a bug: profile completion of non SSO-imported users trigger a fuzzy email - Fix a bug: profile completion of non SSO-imported users trigger a fuzzy email
- Fix a bug: creation of negative credits - Fix a bug: creation of negative credits
- Fix a bug: unable to display profiles of users whom any reservation is associated with a deleted object
- Updated test data to allow passing test suite - Updated test data to allow passing test suite
- [TODO DEPLOY] `rake db:migrate` - [TODO DEPLOY] `rake db:migrate`

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

@ -61,7 +61,7 @@ json.training_reservations @member.reservations.where(reservable_type: 'Training
json.start_at r.slots.first.start_at json.start_at r.slots.first.start_at
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.is_valid @member.training_ids.include?(r.reservable.id) json.is_valid @member.training_ids.include?(r.reservable_id)
json.canceled_at r.slots.first.canceled_at json.canceled_at r.slots.first.canceled_at
end end
json.training_credits @member.training_credits do |tc| json.training_credits @member.training_credits do |tc|