Download as
Browse Code »

Commit 4d40b67889b8210a93aee6233ac7b7b603fe89e6

Authored by Rodrigo Souto
1 parent f81c2116
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[comments-refactor-review] Checking permissions to show edit link

Showing 2 changed files with 4 additions and 3 deletions   Show diff stats
app/helpers/comment_helper.rb
  Diff comments   View file @4d40b67
@@ -56,7 +56,7 @@ module CommentHelper @@ -56,7 +56,7 @@ module CommentHelper
56 end 56 end
57 57
58 def link_for_edit(comment) 58 def link_for_edit(comment)
59 - if comment.author && comment.author == user 59 + if comment.can_be_updated_by?(user)
60 {:link => expirable_comment_link(comment, :edit, _('Edit'), url_for(:profile => profile.identifier, :controller => :comment, :action => :edit, :id => comment.id),:class => 'colorbox')} 60 {:link => expirable_comment_link(comment, :edit, _('Edit'), url_for(:profile => profile.identifier, :controller => :comment, :action => :edit, :id => comment.id),:class => 'colorbox')}
61 end 61 end
62 end 62 end
test/unit/comment_helper_test.rb
  Diff comments   View file @4d40b67
@@ -105,13 +105,14 @@ class CommentHelperTest < ActiveSupport::TestCase @@ -105,13 +105,14 @@ class CommentHelperTest < ActiveSupport::TestCase
105 105
106 should 'do not return link for edit comment' do 106 should 'do not return link for edit comment' do
107 comment = Comment.new 107 comment = Comment.new
  108 + comment.stubs(:can_be_updated_by?).with(user).returns(false)
108 link = link_for_edit(comment) 109 link = link_for_edit(comment)
109 - assert !link 110 + assert_nil link
110 end 111 end
111 112
112 should 'return link for edit comment' do 113 should 'return link for edit comment' do
113 comment = Comment.new 114 comment = Comment.new
114 - comment.author = user 115 + comment.stubs(:can_be_updated_by?).with(user).returns(true)
115 link = link_for_edit(comment) 116 link = link_for_edit(comment)
116 assert link 117 assert link
117 end 118 end