From a7f149e39974a99638e78786ec45aed88737e00c Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Tue, 1 Mar 2011 11:38:30 -0800
Subject: [PATCH] Possible performance gain from not hitting posts relation
---
app/controllers/application_controller.rb | 2 +-
app/helpers/application_helper.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fdc89b961a..2174c8f2d2 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -26,7 +26,7 @@ class ApplicationController < ActionController::Base
if user_signed_in?
@aspect = nil
@object_aspect_ids = []
- @all_aspects = current_user.aspects.includes(:aspect_memberships)
+ @all_aspects = current_user.aspects.includes(:aspect_memberships, :post_visibilities)
@notification_count = Notification.for(current_user, :unread =>true).count
@user_id = current_user.id
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 33f5fc07a0..81e013ebfa 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -22,13 +22,13 @@ module ApplicationHelper
def aspects_with_post aspects, post
aspects.select do |aspect|
- aspect.post_ids.include?(post.id)
+ aspect.post_visibilities.detect{|pv| pv.post_id == post.id}
end
end
def aspects_without_post aspects, post
aspects.reject do |aspect|
- aspect.post_ids.include?(post.id)
+ aspect.post_visibilities.detect{|pv| pv.post_id == post.id}
end
end
--
GitLab