Download as
Browse Code »

Commit ca91bfe73db3c28191cc769e7e0606bf8299021d

Authored by Joenio Costa
1 parent 90b02139
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

test if category is nil before try to get color 

(ActionItem2915)
Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
app/helpers/categories_helper.rb
  Diff comments   View file @ca91bfe
@@ -12,7 +12,7 @@ module CategoriesHelper @@ -12,7 +12,7 @@ module CategoriesHelper
12 end 12 end
13 13
14 def category_color_style(category) 14 def category_color_style(category)
15 - return '' if category.display_color.blank? 15 + return '' if category.nil? or category.display_color.blank?
16 'background-color: #'+category.display_color+';' 16 'background-color: #'+category.display_color+';'
17 end 17 end
18 18
test/unit/categories_helper_test.rb
  Diff comments   View file @ca91bfe
@@ -31,4 +31,10 @@ class CategoriesHelperTest < ActiveSupport::TestCase @@ -31,4 +31,10 @@ class CategoriesHelperTest < ActiveSupport::TestCase
31 assert_equal '', category_color_style(category2) 31 assert_equal '', category_color_style(category2)
32 end 32 end
33 33
  34 + should 'not return category parent color if category is nil' do
  35 + assert_nothing_raised do
  36 + assert_equal '', category_color_style(nil)
  37 + end
  38 + end
  39 +
34 end 40 end