Download as
Browse Code »

Commit 495f736d1aadeb5c5a582691d826acbd8bcdc08a

Authored by Larissa Reis
1 parent a68c9e40
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

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,7 +507,10 @@ class Article < ActiveRecord::Base
507 end 507 end
508 508
509 alias :allow_delete? :allow_post_content? 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 def allow_create?(user) 515 def allow_create?(user)
513 allow_post_content?(user) || allow_publish_content?(user) 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,7 +15,7 @@
15 <%= expirable_button @page, :delete, content, url, options %> 15 <%= expirable_button @page, :delete, content, url, options %>
16 <% end %> 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 <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %> 19 <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
20 <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox'} if url %> 20 <%= expirable_button @page, :spread, content_tag( 'span', _('Spread this') ), url, {:class => 'colorbox'} if url %>
21 <% end %> 21 <% end %>