Download as
Browse Code »

Commit eee333dbd6e2099dde2f7fa7982a21c9e801cc20

Authored by Rodrigo Souto
1 parent 94a1c70a
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

Adding option to add TagsBlock on environment through interface

Showing 2 changed files with 12 additions and 2 deletions   Show diff stats
app/controllers/admin/environment_design_controller.rb
  Diff comments   View file @eee333d
@@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController @@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController
3 protect 'edit_environment_design', :environment 3 protect 'edit_environment_design', :environment
4 4
5 def available_blocks 5 def available_blocks
6 - @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ] 6 + @available_blocks ||= [ ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
7 end 7 end
8 8
9 end 9 end
test/functional/environment_design_controller_test.rb
  Diff comments   View file @eee333d
@@ -6,7 +6,7 @@ class EnvironmentDesignController; def rescue_action(e) raise e end; end @@ -6,7 +6,7 @@ class EnvironmentDesignController; def rescue_action(e) raise e end; end
6 6
7 class EnvironmentDesignControllerTest < ActionController::TestCase 7 class EnvironmentDesignControllerTest < ActionController::TestCase
8 8
9 - ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock ] 9 + ALL_BLOCKS = [ArticleBlock, LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
10 10
11 def setup 11 def setup
12 @controller = EnvironmentDesignController.new 12 @controller = EnvironmentDesignController.new
@@ -175,6 +175,16 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase @@ -175,6 +175,16 @@ class EnvironmentDesignControllerTest &lt; ActionController::TestCase
175 assert_tag :tag => 'input', :attributes => { :id => 'block_address' } 175 assert_tag :tag => 'input', :attributes => { :id => 'block_address' }
176 end 176 end
177 177
  178 + should 'be able to edit TagsBlock' do
  179 + login_as(create_admin_user(Environment.default))
  180 + b = TagsBlock.create!
  181 + e = Environment.default
  182 + e.boxes.create!
  183 + e.boxes.first.blocks << b
  184 + get :edit, :id => b.id
  185 + assert_tag :tag => 'input', :attributes => { :id => 'block_title' }
  186 + end
  187 +
178 should 'create back link to environment control panel' do 188 should 'create back link to environment control panel' do
179 Environment.default.boxes.create!.blocks << CommunitiesBlock.new 189 Environment.default.boxes.create!.blocks << CommunitiesBlock.new
180 Environment.default.boxes.create!.blocks << EnterprisesBlock.new 190 Environment.default.boxes.create!.blocks << EnterprisesBlock.new