Download as
Browse Code »

Commit df49d0370604ea29397ef74537e75373be1fef9f

Authored by Victor Costa
1 parent 5de43a78
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Accept proc in user_data_extras from plugins

Showing 2 changed files with 8 additions and 2 deletions   Show diff stats
app/controllers/public/account_controller.rb
  Diff comments   View file @df49d03
... ... @@ -315,7 +315,11 @@ class AccountController < ApplicationController
315 315 session[:notice] = nil # consume the notice
316 316 end
317 317  
318   - @plugins.each { |plugin| user_data.merge!(plugin.user_data_extras) }
  318 + @plugins.each do |plugin|
  319 + user_data_extras = plugin.user_data_extras
  320 + user_data_extras = instance_exec(&user_data_extras) if user_data_extras.kind_of?(Proc)
  321 + user_data.merge!(user_data_extras)
  322 + end
319 323  
320 324 render :text => user_data.to_json, :layout => false, :content_type => "application/javascript"
321 325 end
... ...
test/functional/account_controller_test.rb
  Diff comments   View file @df49d03
... ... @@ -712,7 +712,9 @@ class AccountControllerTest < ActionController::TestCase
712 712  
713 713 class Plugin2 < Noosfero::Plugin
714 714 def user_data_extras
715   - {:test => 5}
  715 + proc do
  716 + {:test => 5}
  717 + end
716 718 end
717 719 end
718 720 Noosfero::Plugin.stubs(:all).returns([Plugin1.name, Plugin2.name])
... ...