Download as
Browse Code »

Commit 7911d32bbb67031c3b8d6b506b22c3b01aaa8135

Authored by Rodrigo Souto
1 parent 99d66a60
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

Extending hotspot for removing new and upload buttons from article actions

Showing 3 changed files with 13 additions and 3 deletions   Show diff stats
app/views/content_viewer/_article_toolbar.rhtml
  Diff comments   View file @7911d32
... ... @@ -34,11 +34,11 @@
34 34 <%= expirable_button @page, :locale, content, url %>
35 35 <% end %>
36 36  
37   - <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
  37 + <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) if !remove_content_button(:new) %>
38 38 <% end %>
39 39  
40 40 <% if @page.accept_uploads? && @page.allow_create?(user) %>
41   - <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
  41 + <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) if !remove_content_button(:upload)%>
42 42 <% end %>
43 43  
44 44 <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
... ...
lib/noosfero/plugin.rb
  Diff comments   View file @7911d32
... ... @@ -353,7 +353,9 @@ class Noosfero::Plugin
353 353 private
354 354  
355 355 def content_actions
356   - %w[edit delete spread locale suggest home]
  356 + #FIXME 'new' and 'upload' only works for content_remove. It should work for
  357 + #content_expire too.
  358 + %w[edit delete spread locale suggest home new upload]
357 359 end
358 360  
359 361 end
... ...
plugins/work_assignment/lib/work_assignment_plugin.rb
  Diff comments   View file @7911d32
... ... @@ -16,4 +16,12 @@ class WorkAssignmentPlugin &lt; Noosfero::Plugin
16 16 true
17 17 end
18 18  
  19 + def content_remove_new(content)
  20 + content.kind_of?(WorkAssignmentPlugin::WorkAssignment)
  21 + end
  22 +
  23 + def content_remove_upload(content)
  24 + !content.profile.members.include?(context.send(:user))
  25 + end
  26 +
19 27 end
... ...