From 08bcb53ec934e531f43062bf3e196476e9489698 Mon Sep 17 00:00:00 2001
From: Andrew Brown <drusepth@gmail.com>
Date: Sun, 15 Mar 2020 12:37:42 -0500
Subject: [PATCH] fix data vault page issues

---
 app/controllers/data_controller.rb  |  2 +-
 app/views/data/discussions.html.erb | 42 +++++++++++------------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/app/controllers/data_controller.rb b/app/controllers/data_controller.rb
index 5fd0305c..0dc53a83 100644
--- a/app/controllers/data_controller.rb
+++ b/app/controllers/data_controller.rb
@@ -26,7 +26,7 @@ class DataController < ApplicationController
 
   def discussions
     @topics         = Thredded::Topic.where(user_id: current_user.id)
-    @posts          = Thredded::Post.where(user_id: current_user.id).includes(:postable)
+    @posts          = Thredded::Post.where(user_id: current_user.id)
     @private_topics = Thredded::PrivateTopic.where(user_id: current_user.id)
     @private_posts  = Thredded::PrivatePost.where(user_id: current_user.id)
 
diff --git a/app/views/data/discussions.html.erb b/app/views/data/discussions.html.erb
index 441c2632..59ccc669 100644
--- a/app/views/data/discussions.html.erb
+++ b/app/views/data/discussions.html.erb
@@ -73,38 +73,33 @@
         <div class="card-content grey lighten-4">
           <div id="posts-this-week">
             <%= area_chart [
-                { name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
-                { name: 'Responses',   data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
+                { name: 'New threads', data: @topics.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
+                { name: 'Responses',   data: @posts.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
               ], download: true
             %>
           </div>
           <div id="posts-this-month" style="display: none">
             <%= area_chart [
-                { name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
-                { name: 'Responses',   data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
+                { name: 'New threads', data: @topics.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
+                { name: 'Responses',   data: @posts.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
               ], download: true
             %>
           </div>
           <div id="posts-this-year" style="display: none">
             <%= area_chart [
-                { name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
-                { name: 'Responses',   data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
+                { name: 'New threads', data: @topics.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
+                { name: 'Responses',   data: @posts.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
               ], download: true
             %>
           </div>
           <div id="posts-all-time" style="display: none">
             <%= area_chart [
-                { name: 'New threads', data: current_user.thredded_topics.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
-                { name: 'Responses',   data: current_user.thredded_posts.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
+                { name: 'New threads', data: @topics.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
+                { name: 'Responses',   data: @posts.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
               ], download: true
             %>
           </div>
         </div>
-        <div class="card-content">
-          <p class="grey-text">
-            Every field you edit on a page counts as one update. For example, editing a character's age and birthday counts as two updates, even if done at the same time.
-          </p>
-        </div>
       </div>
     </div>
   </div>
@@ -130,38 +125,33 @@
         <div class="card-content grey lighten-4">
           <div id="private-this-week">
             <%= area_chart [
-                { name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
-                { name: 'Responses',   data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
+                { name: 'New threads', data: @private_topics.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
+                { name: 'Responses',   data: @private_posts.where('created_at > ?', DateTime.now - 7.days).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
               ], download: true
             %>
           </div>
           <div id="private-this-month" style="display: none">
             <%= area_chart [
-                { name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
-                { name: 'Responses',   data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
+                { name: 'New threads', data: @private_topics.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } },
+                { name: 'Responses',   data: @private_posts.where('created_at > ?', DateTime.now - 1.month).group_by_day(:created_at).map { |date, count| [date.split(' ').first, count] } }
               ], download: true
             %>
           </div>
           <div id="private-this-year" style="display: none">
             <%= area_chart [
-                { name: 'New threads', data: current_user.thredded_topics.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
-                { name: 'Responses',   data: current_user.thredded_posts.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
+                { name: 'New threads', data: @private_topics.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
+                { name: 'Responses',   data: @private_posts.where('created_at > ?', DateTime.now - 1.year).group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
               ], download: true
             %>
           </div>
           <div id="private-all-time" style="display: none">
             <%= area_chart [
-                { name: 'New threads', data: current_user.thredded_topics.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
-                { name: 'Responses',   data: current_user.thredded_posts.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
+                { name: 'New threads', data: @private_topics.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } },
+                { name: 'Responses',   data: @private_posts.group_by_month(:created_at).map { |date, count| [date.split(' ').first, count] } }
               ], download: true
             %>
           </div>
         </div>
-        <div class="card-content">
-          <p class="grey-text">
-            Every field you edit on a page counts as one update. For example, editing a character's age and birthday counts as two updates, even if done at the same time.
-          </p>
-        </div>
       </div>
     </div>
   </div>