From e3ad078ba59c962899712694924b47a1813a7d5b Mon Sep 17 00:00:00 2001 From: Raphael Sofaer Date: Wed, 30 Mar 2011 16:40:01 -0700 Subject: [PATCH] Scope querying in PhotosController#show --- app/controllers/photos_controller.rb | 2 +- lib/diaspora/user/querying.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index 1e281e7c1..1291513d1 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -139,7 +139,7 @@ class PhotosController < ApplicationController end def show - @photo = current_user.find_visible_post_by_id(params[:id]) + @photo = current_user.find_visible_post_by_id(params[:id], :type => 'Photo') if @photo @parent = StatusMessage.where(:id => @photo.status_message_id).includes(:photos).first if @photo.status_message_id diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb index 72df69bdd..97f7b32be 100644 --- a/lib/diaspora/user/querying.rb +++ b/lib/diaspora/user/querying.rb @@ -6,10 +6,10 @@ module Diaspora module UserModules module Querying - def find_visible_post_by_id( id ) - post = Post.where(:id => id).joins(:contacts).where(:contacts => {:user_id => self.id}).first - post ||= Post.where(:id => id, :author_id => self.person.id).first - post ||= Post.where(:id => id, :public => true).first + def find_visible_post_by_id( id, opts={} ) + post = Post.where(:id => id).joins(:contacts).where(:contacts => {:user_id => self.id}).where(opts).first + post ||= Post.where(:id => id, :author_id => self.person.id).where(opts).first + post ||= Post.where(:id => id, :public => true).where(opts).first end def raw_visible_posts(opts = {})