diff --git a/app/helpers/admin/products_helper.rb b/app/helpers/admin/products_helper.rb index b2f7beada9..d7b8a2086f 100644 --- a/app/helpers/admin/products_helper.rb +++ b/app/helpers/admin/products_helper.rb @@ -32,12 +32,8 @@ module Admin [precised_unit_value, variant.unit_description].compact_blank.join(" ") end - def products_return_to_url(url_filters) - if feature?(:admin_style_v3, spree_current_user) - return session[:products_return_to_url] || admin_products_url - end - - "#{admin_products_path}#{url_filters.empty? ? '' : "#?#{url_filters.to_query}"}" + def products_return_to_url + session[:products_return_to_url] || admin_products_url end # if user hasn't saved any preferences on products page and there's only one producer; diff --git a/app/views/spree/admin/products/edit.html.haml b/app/views/spree/admin/products/edit.html.haml index 003a35eee6..7f6df174db 100644 --- a/app/views/spree/admin/products/edit.html.haml +++ b/app/views/spree/admin/products/edit.html.haml @@ -1,7 +1,7 @@ = admin_inject_available_units - content_for :page_actions do - %li= button_link_to t('admin.products.back_to_products_list'), products_return_to_url(@url_filters), :icon => 'icon-arrow-left' + %li= button_link_to t('admin.products.back_to_products_list'), products_return_to_url, :icon => 'icon-arrow-left' %li#new_product_link = button_link_to t(:new_product), new_object_url, { :icon => 'icon-plus', :id => 'admin_new_product' } @@ -18,6 +18,6 @@ = button t(:update), 'icon-refresh' - = button_link_to t(:cancel), products_return_to_url(@url_filters), icon: 'icon-remove' + = button_link_to t(:cancel), products_return_to_url, icon: 'icon-remove' #product-preview-modal-container