Download as
Browse Code »

Commit ca91bfe73db3c28191cc769e7e0606bf8299021d

Authored by Joenio Costa
1 parent 90b02139
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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