From a0d3921d72203b6ab7208bcceffe61d87ed2d669 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Mon, 28 Mar 2011 10:01:03 -0700
Subject: [PATCH] Fix 500 on tag show with comments
---
app/views/comments/_comment.html.haml | 2 +-
spec/controllers/tags_controller_spec.rb | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index a0d8ae1374..2a55fcd9a7 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -3,7 +3,7 @@
-# the COPYRIGHT file.
%li.comment.posted{:data=>{:guid => comment.id}, :class => ("hidden" if(defined? hidden))}
- - if current_user.owns?(comment) || current_user.owns?(comment.post)
+ - if current_user && current_user.owns?(comment) || current_user.owns?(comment.post)
.right.controls
= link_to image_tag('deletelabel.png'), comment_path(comment), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete comment_delete", :title => t('delete')
= person_image_link(comment.author)
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
index 46d8aa9659..2074978622 100644
--- a/spec/controllers/tags_controller_spec.rb
+++ b/spec/controllers/tags_controller_spec.rb
@@ -41,14 +41,20 @@ describe TagsController do
before do
@post = @user.post(:status_message, :text => "#what", :public => true, :to => 'all')
@user.post(:status_message, :text => "#hello", :public => true, :to => 'all')
- get :show, :name => 'what'
end
it "succeeds" do
+ get :show, :name => 'what'
response.should be_success
end
it "assigns the right set of posts" do
+ get :show, :name => 'what'
assigns[:posts].should == [@post]
end
+ it 'succeeds with comments' do
+ @user.comment('what WHAT!', :on => @post)
+ get :show, :name => 'what'
+ response.should be_success
+ end
end
end
end
--
GitLab