From 829c86823dd6f36c11e7432e664d87cecb6e0c51 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Sun, 3 Jul 2011 20:08:11 -0700 Subject: [PATCH] remove dislikes; didn't change the db structure, just removed the traces in the code since we're not using them --- app/controllers/aspects_controller.rb | 2 +- app/helpers/sockets_helper.rb | 2 +- app/models/user.rb | 6 ++---- app/views/likes/create.js.erb | 2 +- app/views/likes/destroy.js.erb | 2 +- app/views/photos/show.html.haml | 9 +-------- app/views/shared/_stream_element.html.haml | 2 +- spec/models/user_spec.rb | 4 ++-- 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb index d7cc8fcf0..581a3c8ed 100644 --- a/app/controllers/aspects_controller.rb +++ b/app/controllers/aspects_controller.rb @@ -38,7 +38,7 @@ class AspectsController < ApplicationController :type => ['StatusMessage','ActivityStreams::Photo'], :order => session[:sort_order] + ' DESC', :max_time => params[:max_time].to_i - ).includes(:comments, :mentions, :likes, :dislikes) + ).includes(:comments, :mentions, :likes) @posts = PostsFake.new(posts) if params[:only_posts] diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb index 7174b84e4..0d1f149f7 100644 --- a/app/helpers/sockets_helper.rb +++ b/app/helpers/sockets_helper.rb @@ -50,7 +50,7 @@ module SocketsHelper v = render_to_string(:partial => 'comments/comment', :locals => {:post => object.post, :comment => object, :person => object.author, :current_user => user}) elsif object.is_a? Like - v = render_to_string(:partial => 'likes/likes', :locals => {:likes => object.post.likes, :dislikes => object.post.dislikes}) + v = render_to_string(:partial => 'likes/likes', :locals => {:likes => object.post.likes}) elsif object.is_a? Notification v = render_to_string(:partial => 'notifications/popup', :locals => {:note => object, :person => opts[:actor]}) diff --git a/app/models/user.rb b/app/models/user.rb index d0e902d4b..9a2173f8d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -193,10 +193,8 @@ class User < ActiveRecord::Base # @param [Post] post # @return [Like] def like_for(post) - [post.likes, post.dislikes].each do |likes| - likes.each do |like| - return like if like.author_id == self.person.id - end + post.likes.each do |like| + return like if like.author_id == self.person.id end return nil end diff --git a/app/views/likes/create.js.erb b/app/views/likes/create.js.erb index b5486b8b4..67b90b85d 100644 --- a/app/views/likes/create.js.erb +++ b/app/views/likes/create.js.erb @@ -1,4 +1,4 @@ $(".like_action", ".stream_element[data-guid=<%=@like.post_id%>]").html("<%= escape_javascript(like_action(@like.post))%>"); -WebSocketReceiver.processLike("<%=@like.post_id%>", "<%= escape_javascript(render("likes/likes", :post_id => @like.post_id, :likes => @like.post.likes, :dislikes => @like.post.dislikes)) %>"); +WebSocketReceiver.processLike("<%=@like.post_id%>", "<%= escape_javascript(render("likes/likes", :post_id => @like.post_id, :likes => @like.post.likes)) %>"); diff --git a/app/views/likes/destroy.js.erb b/app/views/likes/destroy.js.erb index 7538c2113..2c9e5e9a4 100644 --- a/app/views/likes/destroy.js.erb +++ b/app/views/likes/destroy.js.erb @@ -1,3 +1,3 @@ $(".like_action", ".stream_element[data-guid=<%=@like.post_id%>]").html("<%= escape_javascript(like_action(@like.post))%>"); -WebSocketReceiver.processLike("<%=@like.post_id%>", "<%= escape_javascript(render("likes/likes", :post_id => @like.post_id, :likes => @like.post.likes, :dislikes => @like.post.dislikes)) %>"); +WebSocketReceiver.processLike("<%=@like.post_id%>", "<%= escape_javascript(render("likes/likes", :post_id => @like.post_id, :likes => @like.post.likes)) %>"); diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml index 846463d63..8fb5000b3 100644 --- a/app/views/photos/show.html.haml +++ b/app/views/photos/show.html.haml @@ -63,14 +63,7 @@ .span-16.prepend-4.append-4.last #photo_stream.stream.show - // TODO(likes) - /- if (defined?(current_user) && !current_user.liked?(@parent)) - / %span.like_links - / = link_to t('shared.stream_element.like'), likes_path(:positive => 'true', :post_id => @parent.id), :method => :post, :class => "like_it", :remote => true - / | - / = link_to t('shared.stream_element.dislike'), likes_path(:positive => 'false', :post_id => @parent.id), :method => :post, :class => "dislike_it", :remote => true - %div{:data=>{:guid=>parent.id}} .likes_container - = render "likes/likes", :post_id => parent.id, :likes => parent.likes, :dislikes => parent.dislikes + = render "likes/likes", :post_id => parent.id, :likes => parent.likes = render "comments/comments", :post => parent, :comments => parent.comments, :always_expanded => true diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml index 66ef46deb..244bb2750 100644 --- a/app/views/shared/_stream_element.html.haml +++ b/app/views/shared/_stream_element.html.haml @@ -52,6 +52,6 @@ .likes - if post.likes.size > 0 - = render "likes/likes", :post_id => post.id, :likes => post.likes, :dislikes => post.dislikes, :current_user => current_user + = render "likes/likes", :post_id => post.id, :likes => post.likes, :current_user => current_user = render "comments/comments", :post => post, :comments => post.comments, :current_user => current_user, :condensed => true, :commenting_disabled => (defined?(@commenting_disabled) && @commenting_disabled) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 1822d30e1..c206fe1a7 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -570,13 +570,13 @@ describe User do @message = alice.post(:status_message, :text => "cool", :to => alice.aspects.first) @message2 = bob.post(:status_message, :text => "uncool", :to => bob.aspects.first) @like = alice.like(true, :post => @message) - @dislike = bob.like(false, :post => @message) + @like2 = bob.like(true, :post => @message) end describe '#like_for' do it 'returns the correct like' do alice.like_for(@message).should == @like - bob.like_for(@message).should == @dislike + bob.like_for(@message).should == @like2 end it "returns nil if there's no like" do