Download as
Browse Code »

Commit 2572302ae85ec0d4aee7e663a03b8b6844f10ee6

Authored by Braulio Bhavamitra
1 parent 6b50d1d9
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

plugins: fix hotspot for around_filter 

Around filter need to yield if the plugin is not enabled and need to
receive a block from the controller
Showing 2 changed files with 9 additions and 4 deletions   Show diff stats
lib/noosfero/plugin.rb
  Diff comments   View file @2572302
... ... @@ -138,11 +138,12 @@ class Noosfero::Plugin
138 138 filters = [filters]
139 139 end
140 140 filters.each do |plugin_filter|
  141 + plugin_filter[:options] ||= {}
  142 + plugin_filter[:options][:if] = -> { environment.plugin_enabled? plugin.module_name }
  143 +
141 144 filter_method = "#{plugin.identifier}_#{plugin_filter[:method_name]}".to_sym
142   - controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
143   - controller_class.send(:define_method, filter_method) do
144   - instance_exec(&plugin_filter[:block]) if environment.plugin_enabled?(plugin)
145   - end
  145 + controller_class.send plugin_filter[:type], filter_method, plugin_filter[:options]
  146 + controller_class.send :define_method, filter_method, &plugin_filter[:block]
146 147 end
147 148 end
148 149  
... ...
lib/noosfero/plugin/parent_methods.rb
  Diff comments   View file @2572302
... ... @@ -11,6 +11,10 @@ class Noosfero::Plugin
11 11 @identifier ||= (if self.parents.first.instance_of? Module then self.parents.first else self end).name.underscore
12 12 end
13 13  
  14 + def module_name
  15 + @name ||= (if self.parents.first != Object then self.parents.first else self end).to_s
  16 + end
  17 +
14 18 def public_name
15 19 @public_name ||= self.identifier.gsub '_plugin', ''
16 20 end
... ...