Download as
Browse Code »

Commit 495f736d1aadeb5c5a582691d826acbd8bcdc08a

Authored by Larissa Reis
1 parent a68c9e40
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

spread: only shows spread button if user is logged in and content is public 

(ActionItem3239)
Showing 2 changed files with 5 additions and 2 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @495f736
... ... @@ -507,7 +507,10 @@ class Article < ActiveRecord::Base
507 507 end
508 508  
509 509 alias :allow_delete? :allow_post_content?
510   - alias :allow_spread? :allow_post_content?
  510 +
  511 + def allow_spread?(user = nil)
  512 + user && public?
  513 + end
511 514  
512 515 def allow_create?(user)
513 516 allow_post_content?(user) || allow_publish_content?(user)
... ...
app/views/content_viewer/_article_toolbar.html.erb
  Diff comments   View file @495f736
... ... @@ -15,7 +15,7 @@
15 15 <%= expirable_button @page, :delete, content, url, options %>
16 16 <% end %>
17 17  
18   - <% if !@page.folder? && @page.public? && !remove_content_button(:spread) %>
  18 + <% if !@page.folder? && @page.allow_spread?(user) && !remove_content_button(:spread) %>
19 19 <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
20 20 <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox'} if url %>
21 21 <% end %>
... ...