Download as
Browse Code »

Commit c9061f8056accb6b3825718f3138fe79ffd5bdee

Authored by AntonioTerceiro
1 parent b1a5f5ed
Exists in master and in 28 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, stable, temp_ratings, tests, tests_fixies

ActionItem256: removing blocks from search controller 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1691 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 14 additions and 2 deletions   Show diff stats
app/controllers/application.rb
  Diff comments   View file @c9061f8
@@ -13,13 +13,18 @@ class ApplicationController < ActionController::Base @@ -13,13 +13,18 @@ class ApplicationController < ActionController::Base
13 def self.no_design_blocks 13 def self.no_design_blocks
14 @no_design_blocks = true 14 @no_design_blocks = true
15 end 15 end
  16 + def self.uses_design_blocks?
  17 + !@no_design_blocks
  18 + end
  19 + def uses_design_blocks?
  20 + self.class.uses_design_blocks?
  21 + end
16 module UsesDesignBlocksHelper 22 module UsesDesignBlocksHelper
17 def uses_design_blocks? 23 def uses_design_blocks?
18 - ! self.class.instance_variable_get('@no_design_blocks') 24 + @controller.uses_design_blocks?
19 end 25 end
20 end 26 end
21 helper UsesDesignBlocksHelper 27 helper UsesDesignBlocksHelper
22 - include UsesDesignBlocksHelper  
23 28
24 # Be sure to include AuthenticationSystem in Application Controller instead 29 # Be sure to include AuthenticationSystem in Application Controller instead
25 include AuthenticatedSystem 30 include AuthenticatedSystem
app/controllers/public/search_controller.rb
  Diff comments   View file @c9061f8
@@ -6,6 +6,8 @@ class SearchController < ApplicationController @@ -6,6 +6,8 @@ class SearchController < ApplicationController
6 before_filter :prepare_filter 6 before_filter :prepare_filter
7 before_filter :check_search_whole_site 7 before_filter :check_search_whole_site
8 8
  9 + no_design_blocks
  10 +
9 protected 11 protected
10 12
11 def search(finder, query) 13 def search(finder, query)
test/functional/search_controller_test.rb
  Diff comments   View file @c9061f8
@@ -467,5 +467,10 @@ class SearchControllerTest < Test::Unit::TestCase @@ -467,5 +467,10 @@ class SearchControllerTest < Test::Unit::TestCase
467 get :assets, :asset => 'products' 467 get :assets, :asset => 'products'
468 assert_equal 'Products', assigns(:asset_name) 468 assert_equal 'Products', assigns(:asset_name)
469 end 469 end
  470 +
  471 + should 'not use design blocks' do
  472 + get :index
  473 + assert_no_tag :tag => 'div', :attributes => { :id => 'boxes', :class => 'boxes' }
  474 + end
470 475
471 end 476 end