nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove wasteful join

Browse source
This commit is contained in:
Raphael Sofaer 2011-03-10 18:53:23 -08:00
parent b86098055e
commit 35903514f5
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Gemfile
View file

@ -9,9 +9,6 @@ gem 'chef', '0.9.12', :require => false
gem 'nokogiri', '1.4.3.1'
gem "fog", '0.3.25'
gem "excon", "0.2.4"
#Security
gem 'devise', '1.1.3'
gem 'devise_invitable', :git => 'git://github.com/zhitomirskiyi/devise_invitable.git', :branch => '0.3.5'
@ -43,12 +40,16 @@ gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => '
#File uploading
gem 'carrierwave', '0.5.2'
gem "fog", '0.3.25'
gem "excon", "0.2.4"
gem 'mini_magick', '3.2'
gem 'aws', '2.3.32' # upgrade to 2.4 breaks 1.8 >.<
gem 'fastercsv', '1.5.4', :require => false
gem 'jammit', '0.5.4'
gem 'rest-client', '1.6.1'
gem 'typhoeus'
#Backups
gem 'cloudfiles', '1.4.10', :require => false

6
app/controllers/posts_controller.rb
View file

@ -11,17 +11,17 @@ class PostsController < ApplicationController
def index
if current_user
@posts = StatusMessage.joins(:aspects, :author).where(:pending => false
@posts = StatusMessage.joins(:aspects).where(:pending => false
).where(Aspect.arel_table[:user_id].eq(current_user.id).or(StatusMessage.arel_table[:public].eq(true))
).select('DISTINCT `posts`.*')
else
@posts = StatusMessage.joins(:author).where(:public => true, :pending => false)
@posts = StatusMessage.where(:public => true, :pending => false)
end
if params[:tag]
@posts = @posts.tagged_with(params[:tag])
else
@posts = @posts.where(Person.arel_table[:owner_id].not_eq(nil))
@posts = @posts.joins(:author).where(Person.arel_table[:owner_id].not_eq(nil))
end
@posts = @posts.includes(:comments, :photos).paginate(:page => params[:page], :per_page => 15, :order => 'created_at DESC')