Download as
Browse Code »

Commit 18329cab550773199c14765d041eb2ff7e30539e

Authored by Antonio Terceiro
1 parent 18a8487d
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

rails3: add mandatory argument to blocks passed to instance_eval

Showing 2 changed files with 8 additions and 3 deletions   Show diff stats
app/models/profile_image_block.rb
  Diff comments   View file @18329ca
@@ -15,8 +15,11 @@ class ProfileImageBlock < Block @@ -15,8 +15,11 @@ class ProfileImageBlock < Block
15 def content(args={}) 15 def content(args={})
16 block = self 16 block = self
17 s = show_name 17 s = show_name
18 - lambda do  
19 - render :file => 'blocks/profile_image', :locals => { :block => block, :show_name => s} 18 + lambda do |object|
  19 + render(
  20 + :file => 'blocks/profile_image',
  21 + :locals => { :block => block, :show_name => s }
  22 + )
20 end 23 end
21 end 24 end
22 25
app/models/sellers_search_block.rb
  Diff comments   View file @18329ca
1 class SellersSearchBlock < Block 1 class SellersSearchBlock < Block
2 2
  3 + attr_accessible :title
  4 +
3 def self.description 5 def self.description
4 _('Search for enterprises and products') 6 _('Search for enterprises and products')
5 end 7 end
@@ -18,7 +20,7 @@ class SellersSearchBlock &lt; Block @@ -18,7 +20,7 @@ class SellersSearchBlock &lt; Block
18 20
19 def content(args={}) 21 def content(args={})
20 title = self.title 22 title = self.title
21 - lambda do 23 + lambda do |object|
22 render :file => 'search/_sellers_form', :locals => { :title => title } 24 render :file => 'search/_sellers_form', :locals => { :title => title }
23 end 25 end
24 end 26 end