Merge branch 'spree/master'

* spree/master: Remove respond_override from Spree::Admin::VariantsController that was causing spree/spree#1506
iloveitaly · May 28, 2012 · d9f2625 · d9f2625
2 parents 8d11066 + 49dcdad
commit d9f2625
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/app/controllers/spree/admin/variants_controller_decorator.rb b/app/controllers/spree/admin/variants_controller_decorator.rb
@@ -1,8 +1,4 @@
 Spree::Admin::VariantsController.class_eval do
-  respond_override :update => {:html => {
-    :success => lambda { redirect_to(@variant.is_master ? volume_prices_admin_product_variant_url(@variant.product, @variant) : collection_url) },
-    :failure => lambda { redirect_to(@variant.is_master ? volume_prices_admin_product_variant_url(@variant.product, @variant) : collection_url)  } } }
-
   def load_resource_instance
     parent