Download as
Browse Code »

Commit 4594576f6607ec7fc21022e05f6d11985af4da4f

Authored by Moises Machado
1 parent 2d904cef
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

ActionItem918: fixing catalog for disabled enteprises

Showing 2 changed files with 19 additions and 1 deletions   Show diff stats
app/helpers/catalog_helper.rb
  Diff comments   View file @4594576
... ... @@ -11,11 +11,21 @@ include DisplayHelper
11 11 content_tag('h3', link_to_product(product)) +
12 12 content_tag('ul',
13 13 (product.price ? content_tag('li', _('Price: %s') % ( "%.2f" % product.price), :class => 'product_price') : '') +
14   - content_tag('li', profile.enabled? ? link_to_category(product.product_category) : product.product_category.full_name(' → ') , :class => 'product_category')
  14 + content_tag('li', product_category_name(profile, product.product_category), :class => 'product_category')
15 15 ) +
16 16 (product.description ? content_tag('div', txt2html(product.description), :class => 'description') : tag('br', :style => 'clear:both')),
17 17 :class => 'product')
18 18 }
19 19 content_tag('h1', _('Products/Services')) + content_tag('ul', data, :id => 'product_list')
20 20 end
  21 +
  22 +private
  23 +
  24 + def product_category_name(profile, product_category)
  25 + if profile.enabled?
  26 + link_to_category(product_category)
  27 + else
  28 + product_category ? product_category.full_name(' → ') : _('Uncategorized product')
  29 + end
  30 + end
21 31 end
... ...
test/functional/catalog_controller_test.rb
  Diff comments   View file @4594576
... ... @@ -105,4 +105,12 @@ class CatalogControllerTest < Test::Unit::TestCase
105 105 assert_tag :tag => 'p', :attributes => { :class => 'product_price' }, :content => /Price:/
106 106 end
107 107  
  108 + should 'not crash on index when product has no product_category and enterprise not enabled' do
  109 + ent = Enterprise.create!(:identifier => 'test_enterprise1', :name => 'Test enteprise1', :enabled => false)
  110 + prod = ent.products.create!(:name => 'Product test', :price => 50.00, :product_category => nil)
  111 + assert_nothing_raised do
  112 + get :index, :profile => ent.identifier
  113 + end
  114 + end
  115 +
108 116 end
... ...