noosfero | 2 new commits pushed to repository

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>

Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/b355d30b7c31d5facfbf7b1396e70195c1555ed5">b355d30b</a> by Evandro Junior
Fix Issue #392 - Container block está quebrando o ambiente

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/c8faf7db05c92db3105f666b5cff64621924d608">c8faf7db</a> by Bráulio Bhavamitra
Merge branch 'I393-container_block_crashing' into 'master'

I393 container block crashing

https://gitlab.com/participa/noosfero/issues/392

Container block está quebrando o ambiente
Verificar a chamada box_decorator.select_blocks no plugin container block que não funciona

Leandro Nunes @leandronunes  4 days ago
ActionView::Template::Error (wrong number of arguments (2 for 3)): 10: 11: 12: 13: @page, :request_path => request.path, :locale => locale }).each do |child| %> 14: #block- #block- { width: px; } 15: 16: app/helpers/boxes_helper.rb:159:in select_blocks'
  config/plugins/container_block/views/blocks/container.html.erb:13:inconfig_plugins_container_block_views_blocks_container_html_erb2028328020366621965_95207380' config/plugins/container_block/lib/container_block_plugin/container_block.rb:72:in block in content'
  app/helpers/boxes_helper.rb:139:ininstance_eval' app/helpers/boxes_helper.rb:139:in extract_block_content'
  app/helpers/boxes_helper.rb:92:indisplay_block_content' app/views/shared/block.html.erb:6:in `app_views_sharedblock_html_erb2640157230203373045_95178980' app/helpers/boxes_helper.rb:83:in display_block'
  app/helpers/boxes_helper.rb:74:inblock in display_box_content' app/helpers/boxes_helper.rb:73:in map'
  app/helpers/boxes_helper.rb:73:indisplay_box_content' app/helpers/boxeshelper.rb:62:in display_box'
  app/helpers/boxes_helper.rb:47:inblock in display_boxes' app/helpers/boxes_helper.rb:47:in map'
  app/helpers/boxes_helper.rb:47:indisplay_boxes' app/helpers/boxes_helper.rb:9:in `insert_boxes'

See merge request !490

- - - - -


Changes:

=====================================
plugins/container_block/views/blocks/container.html.erb
=====================================
--- a/plugins/container_block/views/blocks/container.html.erb
+++ b/plugins/container_block/views/blocks/container.html.erb
@@ -10,7 +10,7 @@
 <div class="clear"></div>
 
 <style>
-  <% box_decorator.select_blocks(block.blocks, { :article => @page, :request_path => request.path, :locale => locale }).each do |child| %>
+  <% box_decorator.select_blocks(block, block.blocks, { :article => @page, :request_path => request.path, :locale => locale, params: request.params, controller: controller}).each do |child| %>      
     #block-<%=block.id%> #block-<%=child.id%> { width: <%= block.child_width(child.id) %>px; }
   <% end %>
 </style>

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