From 3b394c1c89c65294814b6cf543e6e0212a869c7b Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 18 Jan 2011 16:48:02 -0800 Subject: [PATCH] One more defualt scope out --- app/controllers/aspects_controller.rb | 2 +- app/models/request.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index ca2d7e4b1..3599c106e 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -89,7 +89,7 @@ class AspectsController < ApplicationController def manage @aspect = :manage @contacts = current_user.contacts.includes(:person).where(:pending => false) - @remote_requests = Request.where(:recipient_id => current_user.person.id) + @remote_requests = Request.where(:recipient_id => current_user.person.id).includes(:sender) @aspects = @all_aspects.includes(:contacts => :person) end diff --git a/app/models/request.rb b/app/models/request.rb index 1cb98c816..6f8c58a85 100644 --- a/app/models/request.rb +++ b/app/models/request.rb @@ -9,8 +9,6 @@ class Request < ActiveRecord::Base include Diaspora::Webhooks include ROXML - default_scope :include => :sender - xml_accessor :sender_handle xml_accessor :recipient_handle