Download as
Browse Code »

Commit 4d40b67889b8210a93aee6233ac7b7b603fe89e6

Authored by Rodrigo Souto
1 parent f81c2116
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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