From 12fcfee71ebd845f33fd511ab46933c3f10207c8 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 10 Jul 2019 12:25:08 +0200 Subject: [PATCH] [bug] unable to export reservations or subscriptions to excel --- CHANGELOG.md | 1 + app/services/users_export_service.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c336cd4d..7dd1fe1b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/app/services/users_export_service.rb b/app/services/users_export_service.rb index 312bd3ed2..4273888e6 100644 --- a/app/services/users_export_service.rb +++ b/app/services/users_export_service.rb @@ -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