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

restored ability to 'unlike'

Browse source
This commit is contained in:
danielgrippi 2012-01-05 14:57:40 -08:00 committed by Dennis Collinson
parent ae5fb67f71
commit 24950bd364
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/likes_controller.rb
View file

@ -34,7 +34,7 @@ class LikesController < ApplicationController
current_user.retract(@like) current_user.retract(@like)
respond_to do |format| respond_to do |format|
format.any { } format.any { }
format.json { render :nothing => true, :status => 204} format.json{ render :json => @like.parent.as_api_response(:backbone), :status => 202 }
end end
else else
respond_to do |format| respond_to do |format|

5
public/javascripts/app/models/post.js
View file

@ -45,7 +45,10 @@ app.models.Post = Backbone.Model.extend({
}, },
unlike : function() { unlike : function() {
this.get("user_like").destroy(); var likeModel = new app.models.Like(this.get("user_like"));
likeModel.url = this.likes.url + "/" + likeModel.id;
likeModel.destroy();
this.set({ user_like : null }); this.set({ user_like : null });
}, },

2
spec/controllers/likes_controller_spec.rb
View file

@ -117,7 +117,7 @@ describe LikesController do
expect { expect {
delete :destroy, :format => :json, id_field => @like.target_id, :id => @like.id delete :destroy, :format => :json, id_field => @like.target_id, :id => @like.id
}.should change(Like, :count).by(-1) }.should change(Like, :count).by(-1)
response.status.should == 204 response.status.should == 202
end end
it 'does not let a user destroy other likes' do it 'does not let a user destroy other likes' do

6
spec/javascripts/app/models/post_spec.js
View file

@ -59,12 +59,12 @@ describe("app.models.Post", function() {
describe("unlike", function(){ describe("unlike", function(){
it("calls destroy on the likes collection", function(){ it("calls destroy on the likes collection", function(){
var like = new app.models.Like(); var like = new app.models.Like();
this.post.set({user_like : like}) this.post.set({user_like : like.toJSON()})
spyOn(like, "destroy"); spyOn(app.models.Like.prototype, "destroy");
this.post.unlike(); this.post.unlike();
expect(like.destroy).toHaveBeenCalled(); expect(app.models.Like.prototype.destroy).toHaveBeenCalled();
}) })
}) })