Download as
Browse Code »

Commit 2917f48ff29734367f890f532a60b884f469e3d9

Authored by Antonio Terceiro
1 parent 176093a3
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 regression with controller filters 

can't call Array() on a hash because it will generate an array of [key,
value] arrays.
Showing 1 changed file with 5 additions and 2 deletions   Show diff stats
lib/noosfero/plugin.rb
  Diff comments   View file @2917f48
... ... @@ -102,8 +102,11 @@ class Noosfero::Plugin
102 102 end
103 103 end
104 104  
105   - def add_controller_filters controller_class, plugin, filters
106   - Array(filters).each do |plugin_filter|
  105 + def add_controller_filters(controller_class, plugin, filters)
  106 + unless filters.is_a?(Array)
  107 + filters = [filters]
  108 + end
  109 + filters.each do |plugin_filter|
107 110 filter_method = (plugin.name.underscore.gsub('/','_') + '_' + plugin_filter[:method_name]).to_sym
108 111 controller_class.send(plugin_filter[:type], filter_method, (plugin_filter[:options] || {}))
109 112 controller_class.send(:define_method, filter_method) do
... ...