Download as
Browse Code »

Commit 2c1b5026184466b60b3ffe361adcde2ea0fe7ff5

Authored by Rodrigo Souto
1 parent 5e5b5f3a
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

Product edit category doesn't crash if product has no category 

(ActionItem2007)
Showing 2 changed files with 8 additions and 1 deletions   Show diff stats
app/controllers/my_profile/manage_products_controller.rb
  Diff comments   View file @2c1b502
@@ -72,7 +72,7 @@ class ManageProductsController < ApplicationController @@ -72,7 +72,7 @@ class ManageProductsController < ApplicationController
72 72
73 def edit_category 73 def edit_category
74 @product = @profile.products.find(params[:id]) 74 @product = @profile.products.find(params[:id])
75 - @category = @product.product_category 75 + @category = @product.product_category || ProductCategory.first
76 @categories = ProductCategory.top_level_for(environment) 76 @categories = ProductCategory.top_level_for(environment)
77 @edit = true 77 @edit = true
78 @level = @category.level 78 @level = @category.level
test/functional/manage_products_controller_test.rb
  Diff comments   View file @2c1b502
@@ -123,6 +123,13 @@ class ManageProductsControllerTest < Test::Unit::TestCase @@ -123,6 +123,13 @@ class ManageProductsControllerTest < Test::Unit::TestCase
123 assert_template 'shared/_dialog_error_messages' 123 assert_template 'shared/_dialog_error_messages'
124 end 124 end
125 125
  126 + should "not crash if product has no category" do
  127 + product = fast_create(Product, :enterprise_id => @enterprise.id)
  128 + assert_nothing_raised do
  129 + post 'edit_category', :profile => @enterprise.identifier, :id => product.id
  130 + end
  131 + end
  132 +
126 should "destroy product" do 133 should "destroy product" do
127 product = fast_create(Product, :name => 'test product', :enterprise_id => @enterprise.id, :product_category_id => @product_category.id) 134 product = fast_create(Product, :name => 'test product', :enterprise_id => @enterprise.id, :product_category_id => @product_category.id)
128 assert_difference Product, :count, -1 do 135 assert_difference Product, :count, -1 do