1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-28 09:24:24 +01:00

[bug] unable to export reservations or subscriptions to excel

This commit is contained in:
Sylvain 2019-07-10 12:25:08 +02:00
parent b0a9d91ed8
commit 12fcfee71e
2 changed files with 3 additions and 2 deletions

View File

@ -1,6 +1,7 @@
# Changelog Fab Manager
- Fix a bug: unable to export members list
- Fix a bug: unable to export reservations or subscriptions to excel
- Fix a bug: projects RSS feed fails to render
- Fix a bug: abuses reports are not notified to admins
- Fix a bug: SubscriptionExpireWorker cannot run due to wrong expiration column in SQL query

View File

@ -13,7 +13,7 @@ class UsersExportService
# export subscriptions
def export_subscriptions(export)
@subscriptions = Subscription.all.includes(:plan, user: [:profile])
@subscriptions = Subscription.all.includes(:plan, statistic_profile: [user: [:profile]])
ActionController::Base.prepend_view_path './app/views/'
# place data in view_assigns
@ -31,7 +31,7 @@ class UsersExportService
# export reservations
def export_reservations(export)
@reservations = Reservation.all.includes(:slots, :reservable, user: [:profile])
@reservations = Reservation.all.includes(:slots, :reservable, statistic_profile: [user: [:profile]])
ActionController::Base.prepend_view_path './app/views/'
# place data in view_assigns