[Git][noosfero/noosfero][master] 3 commits: include a possibility to disable blog menus via lib

[Gabriel Silva]

Gabriel Silva pushed to branch master at Noosfero / noosfero


Commits:
66435e0b by Nivaldo Neto at 2019-08-27T15:12:21Z
include a possibility to disable blog menus via lib

- - - - -
e2ea98e3 by Nivaldo Neto at 2019-08-27T15:12:48Z
fix event view

- - - - -
285390b6 by Gabriel Silva at 2019-08-30T02:21:09Z
Merge branch 'disable-blog-menu-via-lib' into 'master'

Disable blog menu via lib

See merge request noosfero/noosfero!1737
- - - - -


2 changed files:

- app/helpers/article_helper.rb
- lib/noosfero/plugin.rb


Changes:

=====================================
app/helpers/article_helper.rb
=====================================
@@ -228,7 +228,7 @@ module ArticleHelper
       actions << link_to(content, url, { modal: true} ) if url
     end
 
-    if @page.allow_edit?(user) && @page.kind_of?(Event)
+    if @page.allow_edit?(user) && @page.kind_of?(Event) && !remove_content_button(:invite_friends, @page)
       content = font_awesome(:add_user, _('Invite Friends'))
       url = profile.admin_url.merge({controller: 'cms', action: 'invite_to_event', id: @page.id})
       actions << link_to(content, url) if url
@@ -246,12 +246,14 @@ module ArticleHelper
         actions << modal_link_to(font_awesome(:file, label_for_new_article(@page)), profile.admin_url.merge(controller: 'cms', action: 'new', parent_id: (@page.folder? ? @page : @page.parent))) unless remove_content_button(:new, @page)
       end
 
-      content = font_awesome(:clone, label_for_clone_article(@page))
-      url = profile.admin_url.merge({ controller: 'cms', action: 'new', id: @page.id, clone: true, parent_id: (@page.folder? ? @page : @page.parent), type: @page.class})
-      actions << expirable_content_reference(@page, :clone, content, url)
+      if !remove_content_button(:clone, @page)
+        content = font_awesome(:clone, label_for_clone_article(@page))
+        url = profile.admin_url.merge({ controller: 'cms', action: 'new', id: @page.id, clone: true, parent_id: (@page.folder? ? @page : @page.parent), type: @page.class})
+        actions << expirable_content_reference(@page, :clone, content, url)
+      end
     end
 
-    if @page.accept_uploads? && @page.allow_create?(user)
+    if @page.accept_uploads? && @page.allow_create?(user) && !remove_content_button(:upload, @page)
       actions << link_to(font_awesome(:upload, _('Upload files')), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:upload, @page)
     end
 


=====================================
lib/noosfero/plugin.rb
=====================================
@@ -818,7 +818,7 @@ class Noosfero::Plugin
   def content_actions
     #FIXME 'new' and 'upload' only works for content_remove. It should work for
     #content_expire too.
-    %w[edit delete spread locale suggest home new upload undo clone]
+    %w[edit delete spread locale suggest home new upload undo clone invite_friends]
   end
 
 end



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/204aa64b87aa8cb29064f7c9e1087f08407d5be9...285390b653cd9ca887715565611db0d8174bd156

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/204aa64b87aa8cb29064f7c9e1087f08407d5be9...285390b653cd9ca887715565611db0d8174bd156
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20190830/c239a9fb/attachment-0001.html>