From eb4c89cd680920baeb550f43bbe817d5d43c42f8 Mon Sep 17 00:00:00 2001
From: Du Peng <gnepud@gmail.com>
Date: Tue, 19 Sep 2023 14:41:06 +0200
Subject: [PATCH] (bug) unbale to export projects

---
 CHANGELOG.md                    | 1 +
 app/services/project_service.rb | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 789f30438..b1f794d83 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - admin can see reservations of a member
 - Fix a bug: unable to update card for payment schedule
 - Fix a bug: user is_allow_contact is actived by default
+- Fix a bug: unbale to export projects
 
 ## v6.0.14 2023 September 6
 
diff --git a/app/services/project_service.rb b/app/services/project_service.rb
index be85c3cd2..1c3e6628f 100644
--- a/app/services/project_service.rb
+++ b/app/services/project_service.rb
@@ -46,7 +46,8 @@ class ProjectService
 
     records = records.includes(:users, :project_image)
     records = records.page(params[:page]) if paginate
+    total = paginate ? records.total_count : records.count
 
-    { total: records.total_count, projects: records }
+    { total: total, projects: records }
   end
 end